From f257ab4a565f57b292ec59b535ab62afb7263401 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:10:23 -0500
Subject: [PATCH 01/64] change root cargo.toml to use workspaces for dependency
 versioning

---
 Cargo.lock | 719 +++++++++++++++++++++++++++++++++++++++++++++--------
 Cargo.toml |  50 +++-
 2 files changed, 664 insertions(+), 105 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f76da0d4..40e42432 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,9 +24,24 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+
+[[package]]
+name = "attrs"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "provwasm-mocks",
+ "provwasm-std",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
 
 [[package]]
 name = "autocfg"
@@ -41,16 +56,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
 
 [[package]]
-name = "base64"
-version = "0.13.1"
+name = "base16ct"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
 [[package]]
 name = "base64"
-version = "0.21.1"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -67,6 +82,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bech32"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -91,6 +112,12 @@ 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"
@@ -133,31 +160,32 @@ checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
 
 [[package]]
 name = "cosmwasm-crypto"
-version = "1.2.5"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75836a10cb9654c54e77ee56da94d592923092a10b369cdb0dbd56acefc16340"
+checksum = "8ed6aa9f904de106fa16443ad14ec2abe75e94ba003bb61c681c0e43d4c58d2a"
 dependencies = [
  "digest 0.10.7",
+ "ecdsa 0.16.9",
  "ed25519-zebra",
- "k256",
+ "k256 0.13.3",
  "rand_core 0.6.4",
  "thiserror",
 ]
 
 [[package]]
 name = "cosmwasm-derive"
-version = "1.2.5"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c9f7f0e51bfc7295f7b2664fe8513c966428642aa765dad8a74acdab5e0c773"
+checksum = "bc5e72e330bd3bdab11c52b5ecbdeb6a8697a004c57964caeb5d876f0b088b3c"
 dependencies = [
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "cosmwasm-schema"
-version = "1.2.5"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f00b363610218eea83f24bbab09e1a7c3920b79f068334fdfcc62f6129ef9fc"
+checksum = "ac3e3a2136e2a60e8b6582f5dffca5d1a683ed77bf38537d330bc1dfccd69010"
 dependencies = [
  "cosmwasm-schema-derive",
  "schemars",
@@ -168,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "1.2.5"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae38f909b2822d32b275c9e2db9728497aa33ffe67dd463bc67c6a3b7092785c"
+checksum = "f5d803bea6bd9ed61bd1ee0b4a2eb09ee20dbb539cc6e0b8795614d20952ebb1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -179,11 +207,13 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-std"
-version = "1.2.5"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49b85345e811c8e80ec55d0d091e4fcb4f00f97ab058f9be5f614c444a730cb"
+checksum = "ad011ae7447188e26e4a7dbca2fcd0fc186aa21ae5c86df0503ea44c78f9e469"
 dependencies = [
- "base64 0.13.1",
+ "base64",
+ "bech32",
+ "bnum",
  "cosmwasm-crypto",
  "cosmwasm-derive",
  "derivative",
@@ -192,9 +222,19 @@ dependencies = [
  "schemars",
  "serde",
  "serde-json-wasm",
- "sha2 0.10.6",
+ "sha2 0.10.8",
+ "static_assertions",
  "thiserror",
- "uint",
+]
+
+[[package]]
+name = "cosmwasm-storage"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66de2ab9db04757bcedef2b5984fbe536903ada4a8a9766717a4a71197ef34f6"
+dependencies = [
+ "cosmwasm-std",
+ "serde",
 ]
 
 [[package]]
@@ -207,16 +247,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "crunchy"
-version = "0.2.2"
+name = "crypto-bigint"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
 
 [[package]]
 name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -247,6 +293,133 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "cw-address-like"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "451a4691083a88a3c0630a8a88799e9d4cd6679b7ce8ff22b8da2873ff31d380"
+dependencies = [
+ "cosmwasm-std",
+]
+
+[[package]]
+name = "cw-multi-test"
+version = "0.16.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "127c7bb95853b8e828bdab97065c81cb5ddc20f7339180b61b2300565aaa99d1"
+dependencies = [
+ "anyhow",
+ "cosmwasm-std",
+ "cw-storage-plus",
+ "cw-utils",
+ "derivative",
+ "itertools 0.10.5",
+ "k256 0.11.6",
+ "prost 0.9.0",
+ "schemars",
+ "serde",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093dfb4520c48b5848274dd88ea99e280a04bc08729603341c7fb0d758c74321"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cw-address-like",
+ "cw-ownable-derive",
+ "cw-storage-plus",
+ "cw-utils",
+ "thiserror",
+]
+
+[[package]]
+name = "cw-ownable-derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d3bf2e0f341bb6cc100d7d441d31cf713fbd3ce0c511f91e79f14b40a889af"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "cw-storage-plus"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c"
+dependencies = [
+ "cosmwasm-std",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "cw-utils"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c4a657e5caacc3a0d00ee96ca8618745d050b8f757c709babafb81208d4239c"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cw2",
+ "schemars",
+ "semver",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "cw2"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6c120b24fbbf5c3bedebb97f2cc85fbfa1c3287e09223428e7e597b5293c1fa"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cw-storage-plus",
+ "schemars",
+ "semver",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "cw721"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c4d286625ccadc957fe480dd3bdc54ada19e0e6b5b9325379db3130569e914"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cw-utils",
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "der"
 version = "0.6.1"
@@ -257,6 +430,16 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -284,6 +467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -306,10 +490,24 @@ version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der 0.7.8",
+ "digest 0.10.7",
+ "elliptic-curve 0.13.8",
+ "rfc6979 0.4.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
 ]
 
 [[package]]
@@ -339,16 +537,35 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
  "digest 0.10.7",
- "ff",
+ "ff 0.12.1",
  "generic-array",
- "group",
- "pkcs8",
+ "group 0.12.1",
+ "pkcs8 0.9.0",
  "rand_core 0.6.4",
- "sec1",
+ "sec1 0.3.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.5",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "generic-array",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
+ "rand_core 0.6.4",
+ "sec1 0.7.3",
  "subtle",
  "zeroize",
 ]
@@ -406,6 +623,16 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -426,6 +653,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -451,7 +679,18 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
- "ff",
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
  "rand_core 0.6.4",
  "subtle",
 ]
@@ -498,6 +737,30 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "ibc-local"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "provwasm-std",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "ibc-remote"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "provwasm-std",
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -564,6 +827,12 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
+[[package]]
+name = "jsonformat"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a9e3ffc93bf9ba3d42139380ec3255ff6006fdfb1ee3b75ca31c3e42d784296"
+
 [[package]]
 name = "k256"
 version = "0.11.6"
@@ -571,9 +840,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
 dependencies = [
  "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sha2 0.10.6",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "once_cell",
+ "sha2 0.10.8",
+ "signature 2.2.0",
 ]
 
 [[package]]
@@ -603,18 +886,88 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "marker"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "prost 0.11.9",
+ "provwasm-mocks",
+ "provwasm-std",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "memchr"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
+[[package]]
+name = "msgfees"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "provwasm-mocks",
+ "provwasm-std",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "multimap"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
+[[package]]
+name = "name"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "jsonformat",
+ "provwasm-mocks",
+ "provwasm-std",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "nft"
+version = "2.2.0"
+dependencies = [
+ "bech32",
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "cw-multi-test 0.16.5",
+ "cw-ownable",
+ "cw-storage-plus",
+ "cw-utils",
+ "cw2",
+ "cw721",
+ "hex",
+ "provwasm-mocks",
+ "provwasm-std",
+ "schemars",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "thiserror",
+ "uuid",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -636,9 +989,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
@@ -662,8 +1015,18 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 dependencies = [
- "der",
- "spki",
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.8",
+ "spki 0.7.3",
 ]
 
 [[package]]
@@ -688,23 +1051,33 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.5"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617feabb81566b593beb4886fb8c1f38064169dae4dccad0e3220160c3b37203"
+checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282"
 dependencies = [
  "proc-macro2",
- "syn 2.0.16",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.58"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "prost"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
+dependencies = [
+ "bytes",
+ "prost-derive 0.9.0",
+]
+
 [[package]]
 name = "prost"
 version = "0.11.9"
@@ -712,7 +1085,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
  "bytes",
- "prost-derive",
+ "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]]
@@ -729,7 +1112,7 @@ dependencies = [
  "multimap",
  "petgraph",
  "prettyplease 0.1.25",
- "prost",
+ "prost 0.11.9",
  "prost-types",
  "regex",
  "syn 1.0.109",
@@ -737,6 +1120,19 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "prost-derive"
 version = "0.11.9"
@@ -750,13 +1146,26 @@ 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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
 dependencies = [
- "prost",
+ "prost 0.11.9",
 ]
 
 [[package]]
@@ -767,15 +1176,15 @@ dependencies = [
  "itertools 0.11.0",
  "log",
  "pretty_env_logger",
- "prettyplease 0.2.5",
+ "prettyplease 0.2.9",
  "proc-macro2",
- "prost",
+ "prost 0.11.9",
  "prost-build",
  "prost-types",
  "quote",
  "regex",
  "rustix",
- "syn 2.0.16",
+ "syn 2.0.48",
  "walkdir",
 ]
 
@@ -804,11 +1213,11 @@ dependencies = [
  "cosmwasm-std",
  "itertools 0.11.0",
  "proc-macro2",
- "prost",
+ "prost 0.11.9",
  "provwasm-common",
  "quote",
  "serde",
- "syn 2.0.16",
+ "syn 2.0.48",
  "trybuild",
 ]
 
@@ -816,11 +1225,11 @@ dependencies = [
 name = "provwasm-std"
 version = "2.2.0"
 dependencies = [
- "base64 0.21.1",
+ "base64",
  "chrono",
  "cosmwasm-schema",
  "cosmwasm-std",
- "prost",
+ "prost 0.11.9",
  "prost-types",
  "provwasm-common",
  "provwasm-proc-macro",
@@ -830,11 +1239,24 @@ dependencies = [
  "strum_macros",
 ]
 
+[[package]]
+name = "provwasm-tutorial"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "provwasm-std",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "quote"
-version = "1.0.27"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -886,11 +1308,21 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
- "crypto-bigint",
+ "crypto-bigint 0.4.9",
  "hmac",
  "zeroize",
 ]
 
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
 [[package]]
 name = "rustix"
 version = "0.37.26"
@@ -928,9 +1360,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.12"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -940,9 +1372,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.12"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -950,25 +1382,60 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "scope"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "provwasm-mocks",
+ "provwasm-std",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "sec1"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
 dependencies = [
- "base16ct",
- "der",
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.8",
  "generic-array",
- "pkcs8",
+ "pkcs8 0.10.2",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
@@ -993,13 +1460,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.163"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1015,9 +1482,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
  "itoa",
  "ryu",
@@ -1039,9 +1506,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1058,6 +1525,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "spki"
 version = "0.6.0"
@@ -1065,7 +1542,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
  "base64ct",
- "der",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der 0.7.8",
 ]
 
 [[package]]
@@ -1084,7 +1571,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.16",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1106,9 +1593,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.16"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1128,6 +1615,25 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "template"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "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"
@@ -1139,22 +1645,37 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "trigger"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "jsonformat",
+ "provwasm-mocks",
+ "provwasm-std",
+ "schemars",
+ "serde",
+ "thiserror",
 ]
 
 [[package]]
@@ -1179,24 +1700,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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
+[[package]]
+name = "uuid"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -1395,6 +1910,6 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
diff --git a/Cargo.toml b/Cargo.toml
index fac8b3f7..bbae9d5b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,54 @@
 [workspace]
-members = ["packages/proto-build", "packages/provwasm-common", "packages/provwasm-proc-macro", "packages/provwasm-std", "packages/provwasm-mocks"]
-exclude = ["contracts"]
+resolver = "2"
+members = [
+    "packages/proto-build",
+    "packages/provwasm-common",
+    "packages/provwasm-proc-macro",
+    "packages/provwasm-std",
+    "packages/provwasm-mocks",
+    "contracts/attrs",
+    "contracts/ibc/local",
+    "contracts/ibc/remote",
+    "contracts/marker",
+    "contracts/msgfees",
+    "contracts/name",
+    "contracts/nft",
+    "contracts/scope",
+    "contracts/template",
+    "contracts/trigger",
+    "contracts/tutorial"
+]
+
+[workspace.dependencies]
+### CosmWasm
+cosmwasm-schema = { version = "1.2.5" }
+cosmwasm-std = { version = "1.2.5", default-features = false }
+cosmwasm-storage = { version = "1.2.5" }
+
+### ProvWasm
+provwasm-proto-build = { version = "0.1.0", path = "packages/proto-build" }
+provwasm-common = { version = "0.1.0", path = "packages/provwasm-common" }
+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" }
 
 [profile.release]
 opt-level = 3
 debug = false
+rpath = false
+lto = true
 debug-assertions = false
 codegen-units = 1
-incremental = false
\ No newline at end of file
+panic = 'abort'
+incremental = false
+overflow-checks = true
\ No newline at end of file

From f768be823dbd31972e6acb17fbcf8de01331b3a1 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:24:39 -0500
Subject: [PATCH 02/64] update proto-build to use workspace

---
 packages/proto-build/Cargo.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/proto-build/Cargo.toml b/packages/proto-build/Cargo.toml
index 7092b687..d63553b1 100644
--- a/packages/proto-build/Cargo.toml
+++ b/packages/proto-build/Cargo.toml
@@ -12,12 +12,12 @@ itertools = "0.11.0"
 log = "0.4.17"
 pretty_env_logger = "0.5.0"
 prettyplease = "0.2.4"
-prost = "0.11.9"
-prost-build = "0.11.9"
-prost-types = "0.11.9"
+prost = { workspace = true }
+prost-build = { workspace = true }
+prost-types = { workspace = true }
 quote = "1.0.26"
 regex = "1"
 rustix = "0.37.26"
-syn = {version = "2.0.15", features = ["full", "parsing", "extra-traits"]}
+syn = { version = "2.0.15", features = ["full", "parsing", "extra-traits"] }
 walkdir = "2"
 proc-macro2 = "1.0.56"
\ No newline at end of file

From 114b102fa857f3c5eba0ea49c130f71227fd698b Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:32:03 -0500
Subject: [PATCH 03/64] update provwasm-common to use workspace

---
 packages/provwasm-common/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/provwasm-common/Cargo.toml b/packages/provwasm-common/Cargo.toml
index 3d71e540..e7342813 100644
--- a/packages/provwasm-common/Cargo.toml
+++ b/packages/provwasm-common/Cargo.toml
@@ -12,5 +12,5 @@ categories = ["cryptography::cryptocurrencies", "wasm"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = {version = "1.2.5", features = ["stargate"]}
+cosmwasm-std = {workspace = true, features = ["stargate"]}
 

From 45aa8cad28156dfbb27858425bac4739860ee3d9 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 09:48:12 -0500
Subject: [PATCH 04/64] update provwasm-proc-macro to use workspace

---
 packages/provwasm-proc-macro/Cargo.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/provwasm-proc-macro/Cargo.toml b/packages/provwasm-proc-macro/Cargo.toml
index f6130e13..030d58db 100644
--- a/packages/provwasm-proc-macro/Cargo.toml
+++ b/packages/provwasm-proc-macro/Cargo.toml
@@ -19,8 +19,8 @@ quote = "1.0.27"
 syn = "2.0.16"
 
 [dev-dependencies]
-cosmwasm-std = {version = "1.2.5", features = ["stargate"]}
-prost = "0.11.9"
-serde = "1.0.163"
+cosmwasm-std = {workspace = true, features = ["stargate"]}
+prost = {workspace = true}
+serde = {workspace = true}
 trybuild = {version = "1.0.80", features = ["diff"]}
-provwasm-common = { version = "0.1.0", path = "../provwasm-common" }
\ No newline at end of file
+provwasm-common = { workspace = true }
\ No newline at end of file

From bd3b62dd6aaf31f7cec491f5d8a014746b2a8f4b Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 10:09:56 -0500
Subject: [PATCH 05/64] update provwasm-std to use workspace

---
 packages/provwasm-std/Cargo.toml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/provwasm-std/Cargo.toml b/packages/provwasm-std/Cargo.toml
index 39af1ec8..39a12ec3 100644
--- a/packages/provwasm-std/Cargo.toml
+++ b/packages/provwasm-std/Cargo.toml
@@ -10,15 +10,15 @@ keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["api-bindings", "cryptography::cryptocurrencies", "wasm"]
 
 [dependencies]
-chrono = {version = "0.4.24", default-features = false}
-cosmwasm-std = {version = "1.2.5", features = ["stargate"]}
-cosmwasm-schema = { version = "1.2.5" }
-prost = {version = "0.11.9", default-features = false, features = ["prost-derive"]}
-prost-types = {version = "0.11.9", default-features = false}
-provwasm-common = {version = "0.1.0", path = "../provwasm-common" }
-provwasm-proc-macro = {version = "0.1.0", path = "../provwasm-proc-macro" }
-schemars = "0.8.12"
-serde = {version = "1.0.163", default-features = false, features = ["derive"]}
+chrono = { version = "0.4.24", default-features = false }
+cosmwasm-std = { workspace = true, features = ["stargate"] }
+cosmwasm-schema = { workspace = true }
+prost = { workspace = true, default-features = false, features = ["prost-derive"] }
+prost-types = { workspace = true, default-features = false }
+provwasm-common = { workspace = true }
+provwasm-proc-macro = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
 serde-cw-value = "0.7.0"
 base64 = "0.21.0"
 strum_macros = "0.25.3"

From 9da15a31370076f7cefddef62f2be7fb45a18ccb Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 10:14:02 -0500
Subject: [PATCH 06/64] update provwasm-mocks to use workspace

---
 packages/provwasm-mocks/Cargo.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/provwasm-mocks/Cargo.toml b/packages/provwasm-mocks/Cargo.toml
index 37f965da..b743738c 100644
--- a/packages/provwasm-mocks/Cargo.toml
+++ b/packages/provwasm-mocks/Cargo.toml
@@ -11,8 +11,8 @@ keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["development-tools::testing", "cryptography::cryptocurrencies", "wasm"]
 
 [dependencies]
-provwasm-common = { version = "0.1.0", path = "../provwasm-common"}
-provwasm-std = { version = "2.2.0", path = "../provwasm-std" }
-cosmwasm-std = { version = "1.2.5", default-features = false }
-schemars = "0.8.8"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
+provwasm-common = { workspace = true }
+provwasm-std = { workspace = true }
+cosmwasm-std = { workspace = true, default-features = false }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }

From 4b62a546c46cc4437f9163a23a51d57a777b471f Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 10:31:58 -0500
Subject: [PATCH 07/64] update attrs contract to use workspace

---
 contracts/attrs/Cargo.lock | 2374 +++++++++++++++++++++++++++++++-----
 contracts/attrs/Cargo.toml |   33 +-
 2 files changed, 2095 insertions(+), 312 deletions(-)

diff --git a/contracts/attrs/Cargo.lock b/contracts/attrs/Cargo.lock
index 2cb3e40b..a434f2c5 100644
--- a/contracts/attrs/Cargo.lock
+++ b/contracts/attrs/Cargo.lock
@@ -2,6 +2,21 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "ahash"
 version = "0.7.6"
@@ -13,12 +28,32 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
 
+[[package]]
+name = "async-trait"
+version = "0.1.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
 [[package]]
 name = "attrs"
 version = "2.2.0"
@@ -28,6 +63,7 @@ dependencies = [
  "cosmwasm-storage",
  "provwasm-mocks",
  "provwasm-std",
+ "provwasm-test-tube",
  "schemars",
  "serde",
  "serde_json",
@@ -40,12 +76,33 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base16ct"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -54,9 +111,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -64,6 +121,59 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
+[[package]]
+name = "bindgen"
+version = "0.68.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
+dependencies = [
+ "bitflags 2.4.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.16",
+ "which",
+]
+
+[[package]]
+name = "bip32"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
+dependencies = [
+ "bs58",
+ "hmac",
+ "k256 0.13.3",
+ "once_cell",
+ "pbkdf2",
+ "rand_core 0.6.4",
+ "ripemd",
+ "sha2 0.10.6",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
@@ -82,6 +192,21 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+dependencies = [
+ "sha2 0.10.6",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -93,6 +218,27 @@ name = "bytes"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
 
 [[package]]
 name = "cfg-if"
@@ -110,21 +256,80 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "clang-sys"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "const-oid"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
 
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cosmos-sdk-proto"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73c9d2043a9e617b0d602fbc0a0ecd621568edbf3a9774890a6d562389bd8e1c"
+dependencies = [
+ "prost",
+ "prost-types",
+ "tendermint-proto",
+]
+
+[[package]]
+name = "cosmrs"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af13955d6f356272e6def9ff5e2450a7650df536d8934f47052a20c76513d2f6"
+dependencies = [
+ "bip32",
+ "cosmos-sdk-proto",
+ "ecdsa 0.16.9",
+ "eyre",
+ "getrandom",
+ "k256 0.13.3",
+ "rand_core 0.6.4",
+ "serde",
+ "serde_json",
+ "subtle-encoding",
+ "tendermint",
+ "tendermint-rpc",
+ "thiserror",
+]
+
 [[package]]
 name = "cosmwasm-crypto"
 version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75836a10cb9654c54e77ee56da94d592923092a10b369cdb0dbd56acefc16340"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
  "ed25519-zebra",
- "k256",
+ "k256 0.11.6",
  "rand_core 0.6.4",
  "thiserror",
 ]
@@ -219,6 +424,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -229,6 +446,15 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ct-logs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
+dependencies = [
+ "sct",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -242,6 +468,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-ng"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.6.4",
+ "subtle-ng",
+ "zeroize",
+]
+
 [[package]]
 name = "der"
 version = "0.6.1"
@@ -252,6 +491,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -274,11 +529,12 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -295,10 +551,47 @@ version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der 0.7.8",
+ "digest 0.10.7",
+ "elliptic-curve 0.13.8",
+ "rfc6979 0.4.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8 0.10.2",
+ "signature 2.2.0",
+]
+
+[[package]]
+name = "ed25519-consensus"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b"
+dependencies = [
+ "curve25519-dalek-ng",
+ "hex",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "zeroize",
 ]
 
 [[package]]
@@ -308,7 +601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
 dependencies = [
  "curve25519-dalek",
- "hashbrown",
+ "hashbrown 0.12.3",
  "hex",
  "rand_core 0.6.4",
  "serde",
@@ -328,562 +621,2063 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "digest 0.10.6",
- "ff",
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
+ "digest 0.10.7",
+ "ff 0.12.1",
  "generic-array",
- "group",
- "pkcs8",
+ "group 0.12.1",
+ "pkcs8 0.9.0",
  "rand_core 0.6.4",
- "sec1",
+ "sec1 0.3.0",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "ff"
-version = "0.12.1"
+name = "elliptic-curve"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.5",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "generic-array",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
  "rand_core 0.6.4",
+ "sec1 0.7.3",
  "subtle",
+ "zeroize",
 ]
 
 [[package]]
-name = "forward_ref"
-version = "1.0.0"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "generic-array"
-version = "0.14.7"
+name = "errno"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "typenum",
- "version_check",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.2.9"
+name = "eyre"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi",
+ "indenter",
+ "once_cell",
 ]
 
 [[package]]
-name = "group"
+name = "ff"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
- "ff",
  "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.12.3"
+name = "ff"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
- "ahash",
+ "rand_core 0.6.4",
+ "subtle",
 ]
 
 [[package]]
-name = "heck"
-version = "0.4.1"
+name = "flex-error"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b"
+dependencies = [
+ "eyre",
+ "paste",
+]
 
 [[package]]
-name = "hex"
-version = "0.4.3"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "hmac"
-version = "0.12.1"
+name = "form_urlencoded"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "digest 0.10.6",
+ "percent-encoding",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.10.5"
+name = "forward_ref"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
- "either",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.11.0"
+name = "futures-channel"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
- "either",
+ "futures-core",
+ "futures-sink",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.6"
+name = "futures-core"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
-name = "k256"
-version = "0.11.6"
+name = "futures-executor"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
- "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sha2 0.10.6",
+ "futures-core",
+ "futures-task",
+ "futures-util",
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.141"
+name = "futures-io"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "futures-macro"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "autocfg",
- "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
 ]
 
 [[package]]
-name = "num-traits"
-version = "0.2.15"
+name = "futures-sink"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
-name = "once_cell"
-version = "1.17.1"
+name = "futures-task"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "group"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+dependencies = [
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "headers"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "headers-core",
+ "http",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "http"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-proxy"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
+dependencies = [
+ "bytes",
+ "futures",
+ "headers",
+ "http",
+ "hyper",
+ "hyper-rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "webpki",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
+dependencies = [
+ "ct-logs",
+ "futures-util",
+ "hyper",
+ "log",
+ "rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+ "webpki",
+ "webpki-roots",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+
+[[package]]
+name = "js-sys"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "k256"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2 0.10.6",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "once_cell",
+ "sha2 0.10.6",
+ "signature 2.2.0",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+
+[[package]]
+name = "libloading"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest 0.10.7",
+ "hmac",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "peg"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
+dependencies = [
+ "peg-macros",
+ "peg-runtime",
+]
+
+[[package]]
+name = "peg-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
+dependencies = [
+ "peg-runtime",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "peg-runtime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs8"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+dependencies = [
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.8",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "provwasm-common"
+version = "0.1.0"
+dependencies = [
+ "cosmwasm-std",
+]
+
+[[package]]
+name = "provwasm-mocks"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-std",
+ "provwasm-common",
+ "provwasm-std",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "provwasm-proc-macro"
+version = "0.1.0"
+dependencies = [
+ "itertools 0.11.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "provwasm-std"
+version = "2.2.0"
+dependencies = [
+ "base64 0.21.7",
+ "chrono",
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "prost",
+ "prost-types",
+ "provwasm-common",
+ "provwasm-proc-macro",
+ "schemars",
+ "serde",
+ "serde-cw-value",
+ "strum_macros",
+]
+
+[[package]]
+name = "provwasm-test-tube"
+version = "0.1.0"
+dependencies = [
+ "base64 0.21.7",
+ "bindgen",
+ "cosmrs",
+ "cosmwasm-std",
+ "prost",
+ "provwasm-std",
+ "serde",
+ "serde_json",
+ "test-tube-prov",
+ "thiserror",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "rfc6979"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+dependencies = [
+ "crypto-bigint 0.4.9",
+ "hmac",
+ "zeroize",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
+dependencies = [
+ "base64 0.13.1",
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
+dependencies = [
+ "openssl-probe",
+ "rustls",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+
+[[package]]
+name = "ryu"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "schemars"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sct"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "sec1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+dependencies = [
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.8",
+ "generic-array",
+ "pkcs8 0.10.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
+[[package]]
+name = "serde"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-cw-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde-json-wasm"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
 
 [[package]]
-name = "pkcs8"
-version = "0.9.0"
+name = "serde_repr"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de"
 dependencies = [
- "der",
- "spki",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.58"
+name = "sha1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "unicode-ident",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
 ]
 
 [[package]]
-name = "prost"
-version = "0.11.9"
+name = "sha2"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
- "bytes",
- "prost-derive",
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
 ]
 
 [[package]]
-name = "prost-derive"
-version = "0.11.9"
+name = "sha2"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
 dependencies = [
- "anyhow",
- "itertools 0.10.5",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spki"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+dependencies = [
+ "base64ct",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der 0.7.8",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+dependencies = [
+ "heck",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "rustversion",
+ "syn 2.0.16",
 ]
 
 [[package]]
-name = "prost-types"
-version = "0.11.9"
+name = "subtle"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "subtle-encoding"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "subtle-ng"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tendermint"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f0a7d05cf78524782337f8edd55cbc578d159a16ad4affe2135c92f7dbac7f0"
+dependencies = [
+ "bytes",
+ "digest 0.10.7",
+ "ed25519",
+ "ed25519-consensus",
+ "flex-error",
+ "futures",
+ "k256 0.13.3",
+ "num-traits",
+ "once_cell",
+ "prost",
+ "prost-types",
+ "ripemd",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "serde_repr",
+ "sha2 0.10.6",
+ "signature 2.2.0",
+ "subtle",
+ "subtle-encoding",
+ "tendermint-proto",
+ "time",
+ "zeroize",
+]
+
+[[package]]
+name = "tendermint-config"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71a72dbbea6dde12045d261f2c70c0de039125675e8a026c8d5ad34522756372"
 dependencies = [
+ "flex-error",
+ "serde",
+ "serde_json",
+ "tendermint",
+ "toml",
+ "url",
+]
+
+[[package]]
+name = "tendermint-proto"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cec054567d16d85e8c3f6a3139963d1a66d9d3051ed545d31562550e9bcc3d"
+dependencies = [
+ "bytes",
+ "flex-error",
+ "num-derive",
+ "num-traits",
  "prost",
+ "prost-types",
+ "serde",
+ "serde_bytes",
+ "subtle-encoding",
+ "time",
 ]
 
 [[package]]
-name = "provwasm-common"
+name = "tendermint-rpc"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d119d83a130537fc4a98c3c9eb6899ebe857fea4860400a61675bfb5f0b35129"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "flex-error",
+ "futures",
+ "getrandom",
+ "http",
+ "hyper",
+ "hyper-proxy",
+ "hyper-rustls",
+ "peg",
+ "pin-project",
+ "semver",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "subtle",
+ "subtle-encoding",
+ "tendermint",
+ "tendermint-config",
+ "tendermint-proto",
+ "thiserror",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+ "uuid",
+ "walkdir",
+]
+
+[[package]]
+name = "test-tube-prov"
 version = "0.1.0"
 dependencies = [
+ "base64 0.13.1",
+ "cosmrs",
  "cosmwasm-std",
+ "prost",
+ "serde",
+ "serde_json",
+ "tendermint-proto",
+ "thiserror",
 ]
 
 [[package]]
-name = "provwasm-mocks"
-version = "2.2.0"
+name = "thiserror"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
 dependencies = [
- "cosmwasm-std",
- "provwasm-common",
- "provwasm-std",
- "schemars",
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "time"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07"
+dependencies = [
+ "deranged",
  "serde",
+ "time-core",
+ "time-macros",
 ]
 
 [[package]]
-name = "provwasm-proc-macro"
-version = "0.1.0"
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.35.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
- "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "syn 2.0.16",
 ]
 
 [[package]]
-name = "provwasm-std"
-version = "2.2.0"
+name = "tokio-rustls"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
+dependencies = [
+ "rustls",
+ "tokio",
+ "webpki",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
- "base64 0.21.0",
- "chrono",
- "cosmwasm-schema",
- "cosmwasm-std",
- "prost",
- "prost-types",
- "provwasm-common",
- "provwasm-proc-macro",
- "schemars",
- "serde",
- "serde-cw-value",
- "strum_macros",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.27"
+name = "toml"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
- "proc-macro2",
+ "serde",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.5.1"
+name = "tower-service"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
-name = "rand_core"
-version = "0.6.4"
+name = "tracing"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "getrandom",
+ "pin-project-lite",
+ "tracing-core",
 ]
 
 [[package]]
-name = "rfc6979"
-version = "0.3.1"
+name = "tracing-core"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
- "crypto-bigint",
- "hmac",
- "zeroize",
+ "once_cell",
 ]
 
 [[package]]
-name = "rustversion"
-version = "1.0.12"
+name = "try-lock"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
-name = "ryu"
-version = "1.0.13"
+name = "typenum"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
-name = "schemars"
-version = "0.8.12"
+name = "uint"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
 dependencies = [
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
 ]
 
 [[package]]
-name = "schemars_derive"
-version = "0.8.12"
+name = "unicode-bidi"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 1.0.109",
+ "tinyvec",
 ]
 
 [[package]]
-name = "sec1"
-version = "0.3.0"
+name = "untrusted"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
 ]
 
 [[package]]
-name = "serde"
-version = "1.0.163"
+name = "uuid"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
- "serde_derive",
+ "same-file",
+ "winapi-util",
 ]
 
 [[package]]
-name = "serde-cw-value"
-version = "0.7.0"
+name = "want"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "serde",
+ "try-lock",
 ]
 
 [[package]]
-name = "serde-json-wasm"
-version = "0.5.1"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
- "serde",
+ "cfg-if",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.163"
+name = "wasm-bindgen-backend"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn 2.0.16",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
+name = "wasm-bindgen-macro"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.16",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "serde_json"
-version = "1.0.96"
+name = "wasm-bindgen-shared"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+
+[[package]]
+name = "web-sys"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
 dependencies = [
- "itoa",
- "ryu",
- "serde",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "sha2"
-version = "0.9.9"
+name = "webpki"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
-name = "sha2"
-version = "0.10.6"
+name = "webpki-roots"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.6",
+ "webpki",
 ]
 
 [[package]]
-name = "signature"
-version = "1.6.4"
+name = "which"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
- "digest 0.10.6",
- "rand_core 0.6.4",
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
 ]
 
 [[package]]
-name = "spki"
-version = "0.6.0"
+name = "winapi"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "base64ct",
- "der",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
-name = "static_assertions"
-version = "1.1.0"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
-name = "strum_macros"
-version = "0.25.3"
+name = "winapi-util"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.16",
+ "winapi",
 ]
 
 [[package]]
-name = "subtle"
-version = "2.4.1"
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "syn"
-version = "1.0.109"
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.16"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
-name = "thiserror"
-version = "1.0.40"
+name = "windows-targets"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "thiserror-impl",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
-name = "thiserror-impl"
-version = "1.0.40"
+name = "windows-targets"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.16",
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
-name = "typenum"
-version = "1.16.0"
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
-name = "uint"
-version = "0.9.5"
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.8"
+name = "windows_aarch64_msvc"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "windows_aarch64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "windows_i686_gnu"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
diff --git a/contracts/attrs/Cargo.toml b/contracts/attrs/Cargo.toml
index 8d80a028..3b7f88fc 100644
--- a/contracts/attrs/Cargo.toml
+++ b/contracts/attrs/Cargo.toml
@@ -5,21 +5,10 @@ authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 edition = "2021"
 
 exclude = [
-  "attrs.wasm",
-  "checksums.txt",
+    "attrs.wasm",
+    "checksums.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -27,14 +16,14 @@ crate-type = ["cdylib", "rlib"]
 backtraces = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", default-features = false }
-cosmwasm-storage = { version = "1.2.5" }
-provwasm-std = { path = "../../packages/provwasm-std" }
-schemars = "0.8.12"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.40" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true, default-features = false }
+cosmwasm-storage = { workspace = true }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-serde_json = { version = "1.0.96", features = ["std"]}
-provwasm-mocks = { path = "../../packages/provwasm-mocks" }
+serde_json = { workspace = true, features = ["std"] }
+provwasm-mocks = { workspace = true }

From 3444c3d170c8769c3cd8a6dcf2175b0314a33ea3 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 10:54:15 -0500
Subject: [PATCH 08/64] update ibc contracts to use workspace

---
 contracts/ibc/local/Cargo.toml  | 23 ++++++-----------------
 contracts/ibc/remote/Cargo.toml | 23 ++++++-----------------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/contracts/ibc/local/Cargo.toml b/contracts/ibc/local/Cargo.toml
index 18991f76..ff0cfe71 100644
--- a/contracts/ibc/local/Cargo.toml
+++ b/contracts/ibc/local/Cargo.toml
@@ -12,27 +12,16 @@ exclude = [
 [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 = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", features = ["iterator", "staking", "stargate"] }
-cosmwasm-storage = { version = "1.2.5" }
-provwasm-std = { path = "../../../packages/provwasm-std" }
-schemars = "0.8.3"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true, features = ["iterator", "staking", "stargate"] }
+cosmwasm-storage = { workspace = true }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 #provwasm-mocks = { path = "../../../todo/mocks" }
diff --git a/contracts/ibc/remote/Cargo.toml b/contracts/ibc/remote/Cargo.toml
index bda40d01..7f000238 100644
--- a/contracts/ibc/remote/Cargo.toml
+++ b/contracts/ibc/remote/Cargo.toml
@@ -12,27 +12,16 @@ exclude = [
 [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 = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", features = ["ibc3", "iterator", "staking", "stargate"] }
-cosmwasm-storage = { version = "1.2.5" }
-provwasm-std = { path = "../../../packages/provwasm-std" }
-schemars = "0.8.3"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true, features = ["ibc3", "iterator", "staking", "stargate"] }
+cosmwasm-storage = { workspace = true }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 #provwasm-mocks = { path = "../../../todo/mocks" }

From 3f5daaa8be314aa423c2f91eb195ea982addff35 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 11:21:43 -0500
Subject: [PATCH 09/64] update marker contract to use workspace

---
 contracts/marker/Cargo.lock | 2388 ++++++++++++++++++++++++++++++-----
 contracts/marker/Cargo.toml |   29 +-
 2 files changed, 2100 insertions(+), 317 deletions(-)

diff --git a/contracts/marker/Cargo.lock b/contracts/marker/Cargo.lock
index 262dcfea..69caf05c 100644
--- a/contracts/marker/Cargo.lock
+++ b/contracts/marker/Cargo.lock
@@ -2,6 +2,21 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "ahash"
 version = "0.7.6"
@@ -13,24 +28,65 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 
+[[package]]
+name = "async-trait"
+version = "0.1.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base16ct"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -39,9 +95,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -49,6 +105,59 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
+[[package]]
+name = "bindgen"
+version = "0.68.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
+dependencies = [
+ "bitflags 2.4.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.16",
+ "which",
+]
+
+[[package]]
+name = "bip32"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
+dependencies = [
+ "bs58",
+ "hmac",
+ "k256 0.13.3",
+ "once_cell",
+ "pbkdf2",
+ "rand_core 0.6.4",
+ "ripemd",
+ "sha2 0.10.6",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
@@ -67,6 +176,21 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+dependencies = [
+ "sha2 0.10.6",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -78,6 +202,27 @@ name = "bytes"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
 
 [[package]]
 name = "cfg-if"
@@ -95,12 +240,71 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "clang-sys"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "const-oid"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
 
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cosmos-sdk-proto"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73c9d2043a9e617b0d602fbc0a0ecd621568edbf3a9774890a6d562389bd8e1c"
+dependencies = [
+ "prost",
+ "prost-types",
+ "tendermint-proto",
+]
+
+[[package]]
+name = "cosmrs"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af13955d6f356272e6def9ff5e2450a7650df536d8934f47052a20c76513d2f6"
+dependencies = [
+ "bip32",
+ "cosmos-sdk-proto",
+ "ecdsa 0.16.9",
+ "eyre",
+ "getrandom",
+ "k256 0.13.3",
+ "rand_core 0.6.4",
+ "serde",
+ "serde_json",
+ "subtle-encoding",
+ "tendermint",
+ "tendermint-rpc",
+ "thiserror",
+]
+
 [[package]]
 name = "cosmwasm-crypto"
 version = "1.2.5"
@@ -109,7 +313,7 @@ checksum = "75836a10cb9654c54e77ee56da94d592923092a10b369cdb0dbd56acefc16340"
 dependencies = [
  "digest 0.10.7",
  "ed25519-zebra",
- "k256",
+ "k256 0.11.6",
  "rand_core 0.6.4",
  "thiserror",
 ]
@@ -204,6 +408,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -214,6 +430,15 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ct-logs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
+dependencies = [
+ "sct",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -227,6 +452,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-ng"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.6.4",
+ "subtle-ng",
+ "zeroize",
+]
+
 [[package]]
 name = "der"
 version = "0.6.1"
@@ -237,6 +475,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -264,6 +518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -280,10 +535,47 @@ version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der 0.7.8",
+ "digest 0.10.7",
+ "elliptic-curve 0.13.8",
+ "rfc6979 0.4.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8 0.10.2",
+ "signature 2.2.0",
+]
+
+[[package]]
+name = "ed25519-consensus"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b"
+dependencies = [
+ "curve25519-dalek-ng",
+ "hex",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "zeroize",
 ]
 
 [[package]]
@@ -293,7 +585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
 dependencies = [
  "curve25519-dalek",
- "hashbrown",
+ "hashbrown 0.12.3",
  "hex",
  "rand_core 0.6.4",
  "serde",
@@ -313,577 +605,2079 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
  "digest 0.10.7",
- "ff",
+ "ff 0.12.1",
  "generic-array",
- "group",
- "pkcs8",
+ "group 0.12.1",
+ "pkcs8 0.9.0",
  "rand_core 0.6.4",
- "sec1",
+ "sec1 0.3.0",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "ff"
-version = "0.12.1"
+name = "elliptic-curve"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.5",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "generic-array",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
  "rand_core 0.6.4",
+ "sec1 0.7.3",
  "subtle",
+ "zeroize",
 ]
 
 [[package]]
-name = "forward_ref"
-version = "1.0.0"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "generic-array"
-version = "0.14.7"
+name = "errno"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "typenum",
- "version_check",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.2.9"
+name = "eyre"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi",
+ "indenter",
+ "once_cell",
 ]
 
 [[package]]
-name = "group"
+name = "ff"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
- "ff",
  "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.12.3"
+name = "ff"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
- "ahash",
+ "rand_core 0.6.4",
+ "subtle",
 ]
 
 [[package]]
-name = "heck"
-version = "0.4.1"
+name = "flex-error"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b"
+dependencies = [
+ "eyre",
+ "paste",
+]
 
 [[package]]
-name = "hex"
-version = "0.4.3"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "hmac"
-version = "0.12.1"
+name = "form_urlencoded"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "digest 0.10.7",
+ "percent-encoding",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.10.5"
+name = "forward_ref"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
- "either",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.11.0"
+name = "futures-channel"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
- "either",
+ "futures-core",
+ "futures-sink",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.6"
+name = "futures-core"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
-name = "k256"
-version = "0.11.6"
+name = "futures-executor"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
- "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sha2 0.10.6",
+ "futures-core",
+ "futures-task",
+ "futures-util",
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.144"
+name = "futures-io"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
-name = "marker"
-version = "2.2.0"
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cosmwasm-storage",
- "prost",
- "provwasm-mocks",
- "provwasm-std",
- "schemars",
- "serde",
- "thiserror",
-]
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "group"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+dependencies = [
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "headers"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "headers-core",
+ "http",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "http"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-proxy"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
+dependencies = [
+ "bytes",
+ "futures",
+ "headers",
+ "http",
+ "hyper",
+ "hyper-rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "webpki",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
+dependencies = [
+ "ct-logs",
+ "futures-util",
+ "hyper",
+ "log",
+ "rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+ "webpki",
+ "webpki-roots",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+
+[[package]]
+name = "js-sys"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "k256"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2 0.10.6",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "once_cell",
+ "sha2 0.10.6",
+ "signature 2.2.0",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+
+[[package]]
+name = "libloading"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "marker"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "prost",
+ "provwasm-mocks",
+ "provwasm-std",
+ "provwasm-test-tube",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest 0.10.7",
+ "hmac",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "peg"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
+dependencies = [
+ "peg-macros",
+ "peg-runtime",
+]
+
+[[package]]
+name = "peg-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
+dependencies = [
+ "peg-runtime",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "peg-runtime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs8"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+dependencies = [
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.8",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "provwasm-common"
+version = "0.1.0"
+dependencies = [
+ "cosmwasm-std",
+]
+
+[[package]]
+name = "provwasm-mocks"
+version = "2.2.0"
+dependencies = [
+ "cosmwasm-std",
+ "provwasm-common",
+ "provwasm-std",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "provwasm-proc-macro"
+version = "0.1.0"
+dependencies = [
+ "itertools 0.11.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "provwasm-std"
+version = "2.2.0"
+dependencies = [
+ "base64 0.21.7",
+ "chrono",
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "prost",
+ "prost-types",
+ "provwasm-common",
+ "provwasm-proc-macro",
+ "schemars",
+ "serde",
+ "serde-cw-value",
+ "strum_macros",
+]
+
+[[package]]
+name = "provwasm-test-tube"
+version = "0.1.0"
+dependencies = [
+ "base64 0.21.7",
+ "bindgen",
+ "cosmrs",
+ "cosmwasm-std",
+ "prost",
+ "provwasm-std",
+ "serde",
+ "serde_json",
+ "test-tube-prov",
+ "thiserror",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "rfc6979"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+dependencies = [
+ "crypto-bigint 0.4.9",
+ "hmac",
+ "zeroize",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
+dependencies = [
+ "base64 0.13.1",
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
+dependencies = [
+ "openssl-probe",
+ "rustls",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+
+[[package]]
+name = "ryu"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "schemars"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sct"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "sec1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+dependencies = [
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.8",
+ "generic-array",
+ "pkcs8 0.10.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
+[[package]]
+name = "serde"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-cw-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde-json-wasm"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "serde_repr"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de"
 dependencies = [
- "autocfg",
- "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
 ]
 
 [[package]]
-name = "num-traits"
-version = "0.2.15"
+name = "sha1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.17.1"
+name = "socket2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
-name = "opaque-debug"
-version = "0.3.0"
+name = "spin"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
-name = "pkcs8"
-version = "0.9.0"
+name = "spki"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
- "der",
- "spki",
+ "base64ct",
+ "der 0.6.1",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.58"
+name = "spki"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
- "unicode-ident",
+ "base64ct",
+ "der 0.7.8",
 ]
 
 [[package]]
-name = "prost"
-version = "0.11.9"
+name = "static_assertions"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
- "bytes",
- "prost-derive",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.16",
 ]
 
 [[package]]
-name = "prost-derive"
-version = "0.11.9"
+name = "subtle"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "subtle-encoding"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "subtle-ng"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "anyhow",
- "itertools 0.10.5",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "prost-types"
-version = "0.11.9"
+name = "syn"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tendermint"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f0a7d05cf78524782337f8edd55cbc578d159a16ad4affe2135c92f7dbac7f0"
 dependencies = [
+ "bytes",
+ "digest 0.10.7",
+ "ed25519",
+ "ed25519-consensus",
+ "flex-error",
+ "futures",
+ "k256 0.13.3",
+ "num-traits",
+ "once_cell",
  "prost",
+ "prost-types",
+ "ripemd",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "serde_repr",
+ "sha2 0.10.6",
+ "signature 2.2.0",
+ "subtle",
+ "subtle-encoding",
+ "tendermint-proto",
+ "time",
+ "zeroize",
 ]
 
 [[package]]
-name = "provwasm-common"
+name = "tendermint-config"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71a72dbbea6dde12045d261f2c70c0de039125675e8a026c8d5ad34522756372"
+dependencies = [
+ "flex-error",
+ "serde",
+ "serde_json",
+ "tendermint",
+ "toml",
+ "url",
+]
+
+[[package]]
+name = "tendermint-proto"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cec054567d16d85e8c3f6a3139963d1a66d9d3051ed545d31562550e9bcc3d"
+dependencies = [
+ "bytes",
+ "flex-error",
+ "num-derive",
+ "num-traits",
+ "prost",
+ "prost-types",
+ "serde",
+ "serde_bytes",
+ "subtle-encoding",
+ "time",
+]
+
+[[package]]
+name = "tendermint-rpc"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d119d83a130537fc4a98c3c9eb6899ebe857fea4860400a61675bfb5f0b35129"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "flex-error",
+ "futures",
+ "getrandom",
+ "http",
+ "hyper",
+ "hyper-proxy",
+ "hyper-rustls",
+ "peg",
+ "pin-project",
+ "semver",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "subtle",
+ "subtle-encoding",
+ "tendermint",
+ "tendermint-config",
+ "tendermint-proto",
+ "thiserror",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+ "uuid",
+ "walkdir",
+]
+
+[[package]]
+name = "test-tube-prov"
 version = "0.1.0"
 dependencies = [
+ "base64 0.13.1",
+ "cosmrs",
  "cosmwasm-std",
+ "prost",
+ "serde",
+ "serde_json",
+ "tendermint-proto",
+ "thiserror",
 ]
 
 [[package]]
-name = "provwasm-mocks"
-version = "2.2.0"
+name = "thiserror"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
 dependencies = [
- "cosmwasm-std",
- "provwasm-common",
- "provwasm-std",
- "schemars",
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "time"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07"
+dependencies = [
+ "deranged",
  "serde",
+ "time-core",
+ "time-macros",
 ]
 
 [[package]]
-name = "provwasm-proc-macro"
-version = "0.1.0"
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.35.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
- "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "syn 2.0.16",
 ]
 
 [[package]]
-name = "provwasm-std"
-version = "2.2.0"
+name = "tokio-rustls"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
+dependencies = [
+ "rustls",
+ "tokio",
+ "webpki",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
- "base64 0.21.0",
- "chrono",
- "cosmwasm-schema",
- "cosmwasm-std",
- "prost",
- "prost-types",
- "provwasm-common",
- "provwasm-proc-macro",
- "schemars",
- "serde",
- "serde-cw-value",
- "strum_macros",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.27"
+name = "toml"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
- "proc-macro2",
+ "serde",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.5.1"
+name = "tower-service"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
-name = "rand_core"
-version = "0.6.4"
+name = "tracing"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "getrandom",
+ "pin-project-lite",
+ "tracing-core",
 ]
 
 [[package]]
-name = "rfc6979"
-version = "0.3.1"
+name = "tracing-core"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
- "crypto-bigint",
- "hmac",
- "zeroize",
+ "once_cell",
 ]
 
 [[package]]
-name = "rustversion"
-version = "1.0.12"
+name = "try-lock"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
-name = "ryu"
-version = "1.0.13"
+name = "typenum"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
-name = "schemars"
-version = "0.8.12"
+name = "uint"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
 dependencies = [
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
 ]
 
 [[package]]
-name = "schemars_derive"
-version = "0.8.12"
+name = "unicode-bidi"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 1.0.109",
+ "tinyvec",
 ]
 
 [[package]]
-name = "sec1"
-version = "0.3.0"
+name = "untrusted"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
 ]
 
 [[package]]
-name = "serde"
-version = "1.0.163"
+name = "uuid"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
- "serde_derive",
+ "same-file",
+ "winapi-util",
 ]
 
 [[package]]
-name = "serde-cw-value"
-version = "0.7.0"
+name = "want"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "serde",
+ "try-lock",
 ]
 
 [[package]]
-name = "serde-json-wasm"
-version = "0.5.1"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
- "serde",
+ "cfg-if",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.163"
+name = "wasm-bindgen-backend"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn 2.0.16",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
+name = "wasm-bindgen-macro"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.16",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "serde_json"
-version = "1.0.96"
+name = "wasm-bindgen-shared"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+
+[[package]]
+name = "web-sys"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
 dependencies = [
- "itoa",
- "ryu",
- "serde",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "sha2"
-version = "0.9.9"
+name = "webpki"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
-name = "sha2"
-version = "0.10.6"
+name = "webpki-roots"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
+ "webpki",
 ]
 
 [[package]]
-name = "signature"
-version = "1.6.4"
+name = "which"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
- "digest 0.10.7",
- "rand_core 0.6.4",
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
 ]
 
 [[package]]
-name = "spki"
-version = "0.6.0"
+name = "winapi"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "base64ct",
- "der",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
-name = "static_assertions"
-version = "1.1.0"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
-name = "strum_macros"
-version = "0.25.3"
+name = "winapi-util"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.16",
+ "winapi",
 ]
 
 [[package]]
-name = "subtle"
-version = "2.5.0"
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "syn"
-version = "1.0.109"
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.16"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
-name = "thiserror"
-version = "1.0.40"
+name = "windows-targets"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "thiserror-impl",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
-name = "thiserror-impl"
-version = "1.0.40"
+name = "windows-targets"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.16",
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
-name = "typenum"
-version = "1.16.0"
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
-name = "uint"
-version = "0.9.5"
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.8"
+name = "windows_aarch64_msvc"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "windows_aarch64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "windows_i686_gnu"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
diff --git a/contracts/marker/Cargo.toml b/contracts/marker/Cargo.toml
index acd33e1b..2bf43c32 100644
--- a/contracts/marker/Cargo.toml
+++ b/contracts/marker/Cargo.toml
@@ -9,17 +9,6 @@ exclude = [
   "checksums.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -28,14 +17,14 @@ crate-type = ["cdylib", "rlib"]
 backtraces = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5" }
-cosmwasm-storage = { version = "1.2.5" }
-provwasm-std = { path = "../../packages/provwasm-std" }
-schemars = "0.8.12"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.40" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cosmwasm-storage = { workspace = true }
+provwasm-std = { workspace = true }
+schemars = {workspace = true}
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-prost = {version = "0.11.9", default-features = false}
-provwasm-mocks = { path = "../../packages/provwasm-mocks" }
+prost = {workspace = true, default-features = false}
+provwasm-mocks = { workspace = true }

From a7e10c641ad6cb4cc6e8614b4d4ea4e0a8f791b9 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 11:39:32 -0500
Subject: [PATCH 10/64] update msgfees contract to use workspace

---
 contracts/msgfees/Cargo.toml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/contracts/msgfees/Cargo.toml b/contracts/msgfees/Cargo.toml
index f8d08c8c..e745f467 100644
--- a/contracts/msgfees/Cargo.toml
+++ b/contracts/msgfees/Cargo.toml
@@ -5,21 +5,10 @@ authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 edition = "2021"
 
 exclude = [
-  "msgfees.wasm",
-  "checksums.txt",
+    "msgfees.wasm",
+    "checksums.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -27,13 +16,13 @@ crate-type = ["cdylib", "rlib"]
 backtraces = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5" }
-cosmwasm-storage = "1.2.5"
-provwasm-std = { path = "../../packages/provwasm-std"}
-schemars = "0.8.12"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.40" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cosmwasm-storage = { workspace = true }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-provwasm-mocks = { path = "../../packages/provwasm-mocks" }
+provwasm-mocks = { workspace = true }

From 84854490dc8680fc7d876d17c1831bfbea9c22ca Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 11:46:01 -0500
Subject: [PATCH 11/64] update name contract to use workspace

---
 contracts/name/Cargo.toml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/contracts/name/Cargo.toml b/contracts/name/Cargo.toml
index ecfc9f18..98b6c80e 100644
--- a/contracts/name/Cargo.toml
+++ b/contracts/name/Cargo.toml
@@ -5,21 +5,10 @@ authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 edition = "2021"
 
 exclude = [
-  "name.wasm",
-  "checksums.txt",
+    "name.wasm",
+    "checksums.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -27,14 +16,14 @@ crate-type = ["cdylib", "rlib"]
 backtraces = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5" }
-cosmwasm-storage = { version = "1.2.5" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cosmwasm-storage = { workspace = true }
 jsonformat = "2.0.0"
-provwasm-std = { path = "../../packages/provwasm-std" }
-schemars = "0.8.12"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.40" }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-provwasm-mocks = { path = "../../packages/provwasm-mocks" }
+provwasm-mocks = { workspace = true }

From fbf9ae51256d4a45da4af3212d0e026dd1e18b2a Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 12:04:10 -0500
Subject: [PATCH 12/64] update nft contract to use workspace

---
 contracts/nft/Cargo.toml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/contracts/nft/Cargo.toml b/contracts/nft/Cargo.toml
index 2cdaaf2a..5cca53da 100644
--- a/contracts/nft/Cargo.toml
+++ b/contracts/nft/Cargo.toml
@@ -9,17 +9,6 @@ exclude = [
     "checksums.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -28,25 +17,25 @@ backtraces = []
 
 [dependencies]
 bech32 = "0.9.1"
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", features = ["cosmwasm_1_1"] }
-cosmwasm-storage = { version = "1.2.5" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true, features = ["cosmwasm_1_1"] }
+cosmwasm-storage = { workspace = true }
 cw2 = "1.0.1"
 cw721 = "0.18.0"
 cw-ownable = "0.5.1"
 cw-storage-plus = { version = "1.1.0", features = ["iterator"] }
 cw-utils = "1.0.1"
 hex = { version = "0.4.3", default-features = false }
-provwasm-std = { path = "../../packages/provwasm-std" }
-schemars = "0.8.10"
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0.96" }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+serde_json = { workspace = true }
 sha2 = { version = "0.10.7", default-features = false }
-thiserror = { version = "1.0.31" }
+thiserror = { workspace = true }
 semver = "1"
 uuid = { version = "1.4.1", default-features = false }
 
 [dev-dependencies]
-serde_json = { version = "1.0.96", features = ["std"] }
-provwasm-mocks = { path = "../../packages/provwasm-mocks" }
+serde_json = { workspace = true, features = ["std"] }
+provwasm-mocks = { workspace = true }
 cw-multi-test = "0.16.2"
\ No newline at end of file

From 2e666e652bee691b3c385efb88c9b22733ba7191 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 12:28:47 -0500
Subject: [PATCH 13/64] update scope contract to use workspace

---
 contracts/scope/Cargo.toml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/contracts/scope/Cargo.toml b/contracts/scope/Cargo.toml
index f3544b2f..6a258a60 100644
--- a/contracts/scope/Cargo.toml
+++ b/contracts/scope/Cargo.toml
@@ -5,21 +5,10 @@ authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 edition = "2021"
 
 exclude = [
-  "scope.wasm",
-  "checksums.txt",
+    "scope.wasm",
+    "checksums.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -27,14 +16,14 @@ crate-type = ["cdylib", "rlib"]
 backtraces = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", default-features = false }
-cosmwasm-storage = { version = "1.2.5" }
-provwasm-std = { path = "../../packages/provwasm-std" }
-schemars = "0.8.12"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.40" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true, default-features = false }
+cosmwasm-storage = { workspace = true }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-serde_json = { version = "1.0.96", features = ["std"]}
-provwasm-mocks = { path = "../../packages/provwasm-mocks" }
+serde_json = { workspace = true, features = ["std"] }
+provwasm-mocks = { workspace = true }

From b9863c39aae2c592ea740617600857241d3160ab Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 12:56:29 -0500
Subject: [PATCH 14/64] update template contract to use workspace

---
 contracts/template/Cargo.toml | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/contracts/template/Cargo.toml b/contracts/template/Cargo.toml
index 7cb59aec..7acadb50 100644
--- a/contracts/template/Cargo.toml
+++ b/contracts/template/Cargo.toml
@@ -9,17 +9,6 @@ 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 = []
 
@@ -36,18 +25,18 @@ optimize-arm = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-provwasm-std = { version = "2.0.0" }
+provwasm-std = { workspace = true }
 cw-utils = { version = "1.0.1" }
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", features = ["cosmwasm_1_1"] }
-cosmwasm-storage = { version = "1.2.5" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true, features = ["cosmwasm_1_1"] }
+cosmwasm-storage = { workspace = true }
 cw-storage-plus = { version = "1.0.1", features = ["iterator"] }
 cw2 = "1.0.1"
-schemars = "0.8.10"
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.31" }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 semver = "1"
 
 [dev-dependencies]
-provwasm-mocks = { version = "2.0.0" }
+provwasm-mocks = { workspace = true }
 cw-multi-test = "0.17.0"

From 7bb2f73d1c196a671f0388dbc373ad68d4f4ed42 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:23:44 -0500
Subject: [PATCH 15/64] update trigger contract to use workspace

---
 contracts/trigger/Cargo.toml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/contracts/trigger/Cargo.toml b/contracts/trigger/Cargo.toml
index bb209276..d455ab87 100644
--- a/contracts/trigger/Cargo.toml
+++ b/contracts/trigger/Cargo.toml
@@ -5,21 +5,10 @@ authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
 edition = "2021"
 
 exclude = [
-  "trigger.wasm",
-  "checksums.txt",
+    "trigger.wasm",
+    "checksums.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -27,14 +16,14 @@ crate-type = ["cdylib", "rlib"]
 backtraces = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5" }
-cosmwasm-storage = { version = "1.2.5" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cosmwasm-storage = { workspace = true }
 jsonformat = "2.0.0"
-provwasm-std = { path = "../../packages/provwasm-std" }
-schemars = "0.8.12"
-serde = { version = "1.0.163", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.40" }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-provwasm-mocks = { path = "../../packages/provwasm-mocks" }
+provwasm-mocks = { workspace = true }

From d98e81d7b36fbbaecbac70a509672d5a5077bcec Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:51:39 -0500
Subject: [PATCH 16/64] update tutorial contract to use workspace

---
 contracts/tutorial/Cargo.toml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/contracts/tutorial/Cargo.toml b/contracts/tutorial/Cargo.toml
index e1026801..15c752b3 100644
--- a/contracts/tutorial/Cargo.toml
+++ b/contracts/tutorial/Cargo.toml
@@ -8,22 +8,11 @@ repository = "https://github.com/provenance-io/fkneeland-figure/smart-contract-t
 description = "A simple smart contract used for testing inside of the Provenance blockchain"
 
 exclude = [
-  # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
-  "contract.wasm",
-  "hash.txt",
+    # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+    "contract.wasm",
+    "hash.txt",
 ]
 
-[profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
-debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
@@ -37,13 +26,13 @@ backtraces = []
 #library = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.2.5" }
-cosmwasm-std = { version = "1.2.5", default-features = false }
-cosmwasm-storage = { version = "1.2.5" }
-provwasm-std = { path = "../../packages/provwasm-std" }
-schemars = "0.8.3"
-serde = { version = "1.0.127", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.26" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true, default-features = false }
+cosmwasm-storage = { workspace = true }
+provwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 #provwasm-mocks = { path = "../../todo/mocks" }

From 0e6bd90fb893d986642ede1cf164d74c8d8f9f68 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 14:39:10 -0500
Subject: [PATCH 17/64] fix attrs contract warnings

---
 contracts/attrs/src/contract.rs | 26 +++++++++++++-------------
 contracts/attrs/src/helpers.rs  |  8 +++++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/contracts/attrs/src/contract.rs b/contracts/attrs/src/contract.rs
index c07a29f7..66370408 100644
--- a/contracts/attrs/src/contract.rs
+++ b/contracts/attrs/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
+    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
 };
 use provwasm_std::types::provenance::attribute::v1::{AttributeQuerier, AttributeType};
 
@@ -135,7 +135,7 @@ fn try_delete_distinct_label(
         env.contract.address.clone(),
         env.contract.address,
         &attr_name,
-        to_binary(&Label { text: value })?,
+        to_json_binary(&Label { text: value })?,
     )?;
     let res = Response::new()
         .add_message(msg)
@@ -159,11 +159,11 @@ fn try_update_label(
         env.contract.address.clone(),
         env.contract.address,
         &attr_name,
-        to_binary(&Label {
+        to_json_binary(&Label {
             text: original_text,
         })?,
         AttributeType::Json,
-        to_binary(&Label { text: update_text })?,
+        to_json_binary(&Label { text: update_text })?,
         AttributeType::Json,
     )?;
     let res = Response::new()
@@ -180,12 +180,12 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<QueryResponse, StdEr
     let state = config_read(deps.storage).load()?;
     let attr_name = format!("{}.{}", "label", state.contract_name);
     match msg {
-        QueryMsg::GetLabelName {} => to_binary(&LabelNameResponse { name: attr_name }),
+        QueryMsg::GetLabelName {} => to_json_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_binary(&LabelsResponse { labels })
+            to_json_binary(&LabelsResponse { labels })
         }
     }
 }
@@ -200,7 +200,7 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response,
 mod tests {
     use super::*;
     use cosmwasm_std::testing::{mock_env, mock_info, MOCK_CONTRACT_ADDR};
-    use cosmwasm_std::{from_binary, Binary, CosmosMsg};
+    use cosmwasm_std::{from_json, Binary, CosmosMsg};
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::attribute::v1::{
         Attribute, MsgAddAttributeRequest, MsgDeleteAttributeRequest, MsgUpdateAttributeRequest,
@@ -368,7 +368,7 @@ mod tests {
             CosmosMsg::Stargate { type_url, value } => {
                 let expected: Binary = MsgAddAttributeRequest {
                     name: "label.contract.pb".to_string(),
-                    value: to_binary(&Label {
+                    value: to_json_binary(&Label {
                         text: "text".to_string(),
                     })
                     .unwrap()
@@ -535,12 +535,12 @@ mod tests {
         match &res.messages[0].msg {
             CosmosMsg::Stargate { type_url, value } => {
                 let expected: Binary = MsgUpdateAttributeRequest {
-                    original_value: to_binary(&Label {
+                    original_value: to_json_binary(&Label {
                         text: "original_text".to_string(),
                     })
                     .unwrap()
                     .0,
-                    update_value: to_binary(&Label {
+                    update_value: to_json_binary(&Label {
                         text: "update_text".to_string(),
                     })
                     .unwrap()
@@ -584,7 +584,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_binary(&bin).unwrap();
+        let rep: LabelNameResponse = from_json(&bin).unwrap();
         assert_eq!(
             rep,
             LabelNameResponse {
@@ -604,7 +604,7 @@ mod tests {
                 account: MOCK_CONTRACT_ADDR.to_string(),
                 attributes: vec![Attribute {
                     name: "label.contract.pb".to_string(),
-                    value: to_binary(&Label {
+                    value: to_json_binary(&Label {
                         text: "text".to_string(),
                     })
                     .unwrap()
@@ -632,7 +632,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_binary(&bin).unwrap();
+        let rep: LabelsResponse = from_json(&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 a5d273cd..ec5eab97 100644
--- a/contracts/attrs/src/helpers.rs
+++ b/contracts/attrs/src/helpers.rs
@@ -1,4 +1,6 @@
-use cosmwasm_std::{from_binary, to_binary, Addr, Binary, CosmosMsg, Empty, StdError, StdResult};
+use cosmwasm_std::{
+    from_json, to_json_binary, Addr, Binary, CosmosMsg, Empty, StdError, StdResult,
+};
 use provwasm_std::types::provenance::attribute::v1::{
     AttributeQuerier, AttributeType, MsgAddAttributeRequest, MsgDeleteAttributeRequest,
     MsgDeleteDistinctAttributeRequest, MsgUpdateAttributeRequest,
@@ -67,7 +69,7 @@ pub fn add_json_attribute<H: Into<Addr>, S: Into<String>, T: Serialize + ?Sized>
         address,
         contract_address,
         name,
-        to_binary(data)?,
+        to_json_binary(data)?,
         AttributeType::Json,
     )
 }
@@ -149,7 +151,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_binary(&Binary::from(a.value.clone())))
+        .map(|a| from_json(&Binary::from(a.value.clone())))
         .collect()
 }
 

From cd18b418f6aa2b8cf8a4f5dea0c43c20ed808777 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:49:26 -0500
Subject: [PATCH 18/64] fix ibc contracts warnings

---
 contracts/ibc/local/src/contract.rs  | 10 +++++-----
 contracts/ibc/local/src/ibc.rs       | 12 ++++++------
 contracts/ibc/remote/src/contract.rs |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/contracts/ibc/local/src/contract.rs b/contracts/ibc/local/src/contract.rs
index 4b7badd2..0815b42c 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_binary, Deps, DepsMut, Env, IbcMsg, MessageInfo, Order, QueryResponse,
+    entry_point, to_json_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_binary(&packet)?,
+        data: to_json_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_binary(&query_admin(deps)?),
-        QueryMsg::Account { channel_id } => to_binary(&query_account(deps, channel_id)?),
-        QueryMsg::ListAccounts {} => to_binary(&query_list_accounts(deps)?),
+        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)?),
     }
 }
 
diff --git a/contracts/ibc/local/src/ibc.rs b/contracts/ibc/local/src/ibc.rs
index ade14470..577722c2 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_slice, to_binary, DepsMut, Env, IbcBasicResponse, IbcChannelCloseMsg,
+    entry_point, from_json, to_json_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_binary(&packet)?,
+        data: to_json_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_slice(&msg.original_packet.data)?;
+    let packet: PacketMsg = from_json(&msg.original_packet.data)?;
     match packet {
         PacketMsg::WhoAmI {} => {
-            let res: AcknowledgementMsg<WhoAmIResponse> = from_slice(&msg.acknowledgement.data)?;
+            let res: AcknowledgementMsg<WhoAmIResponse> = from_json(&msg.acknowledgement.data)?;
             acknowledge_who_am_i(deps, caller, res)
         }
     }
@@ -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_slice(&r).unwrap();
+        let acct: AccountResponse = from_json(&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_slice(&r).unwrap();
+        let acct: AccountResponse = from_json(&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 da3d576d..054b7375 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_slice, to_binary, DepsMut, Empty, Env, Event, Ibc3ChannelOpenResponse,
+    entry_point, from_json, to_json_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_slice(&packet.data)?;
+    let msg: PacketMsg = from_json(&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_binary(&AcknowledgementMsg::Ok(response))?;
+    let acknowledgement = to_json_binary(&AcknowledgementMsg::Ok(response))?;
     // and we are golden
     Ok(IbcReceiveResponse::new()
         .set_ack(acknowledgement)

From 4658cad9e060087d2e67212da0fe692f0f9b13de Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:08:43 -0500
Subject: [PATCH 19/64] fix marker contracts warnings

---
 contracts/marker/schema/marker.json |  2 +-
 contracts/marker/src/contract.rs    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contracts/marker/schema/marker.json b/contracts/marker/schema/marker.json
index 0be1c1d3..d6dff32e 100644
--- a/contracts/marker/schema/marker.json
+++ b/contracts/marker/schema/marker.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "marker",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/marker/src/contract.rs b/contracts/marker/src/contract.rs
index 6a12e33f..ab9b452f 100644
--- a/contracts/marker/src/contract.rs
+++ b/contracts/marker/src/contract.rs
@@ -1,6 +1,6 @@
 use cosmwasm_std::{
-    attr, entry_point, to_binary, Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
-    StdError, StdResult, Uint128,
+    attr, entry_point, to_json_binary, Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse,
+    Response, StdError, StdResult, Uint128,
 };
 
 use provwasm_std::types::provenance::marker::v1::{MarkerQuerier, MarkerType};
@@ -252,14 +252,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_binary(&marker)
+    to_json_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_binary(&marker)
+    to_json_binary(&marker)
 }
 
 #[cfg(test)]
@@ -267,7 +267,7 @@ mod tests {
     use super::*;
     use crate::types::Marker;
     use cosmwasm_std::testing::{mock_env, mock_info};
-    use cosmwasm_std::{from_binary, Binary, CosmosMsg};
+    use cosmwasm_std::{from_json, Binary, CosmosMsg};
     use prost::Message;
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::shim::Any;
@@ -772,7 +772,7 @@ mod tests {
 
         let bin = query(deps.as_ref(), mock_env(), req).unwrap();
 
-        let marker: Marker = from_binary(&bin).unwrap();
+        let marker: Marker = from_json(&bin).unwrap();
         assert_eq!(marker.marker_account, expected_marker);
         assert_eq!(
             marker.marker_account.base_account.unwrap().address,

From e91d3c4089021f08b87010503f70c78de5e633a7 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:51:55 -0500
Subject: [PATCH 20/64] fix name contracts warnings

---
 contracts/name/src/contract.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/contracts/name/src/contract.rs b/contracts/name/src/contract.rs
index 3cf888c4..0cba8f71 100644
--- a/contracts/name/src/contract.rs
+++ b/contracts/name/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
+    entry_point, to_json_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_binary(&name)
+    to_json_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_binary(&params)
+    to_json_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_binary(&names)
+    to_json_binary(&names)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use cosmwasm_std::testing::{mock_env, mock_info};
-    use cosmwasm_std::{from_binary, Binary, CosmosMsg};
+    use cosmwasm_std::{from_json, 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_binary(&bin).unwrap();
+        let rep: QueryResolveResponse = from_json(&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_binary(&bin).unwrap();
+        let rep: QueryReverseLookupResponse = from_json(&bin).unwrap();
         assert_eq!(rep, mock_response);
     }
 
@@ -459,7 +459,7 @@ mod tests {
         .unwrap();
 
         // Ensure that we got zero records.
-        let rep: QueryReverseLookupResponse = from_binary(&bin).unwrap();
+        let rep: QueryReverseLookupResponse = from_json(&bin).unwrap();
         assert_eq!(rep, mock_response);
     }
 }

From 3b585243648c9046dfbd73a5ae40b07be85e2367 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:34:37 -0500
Subject: [PATCH 21/64] fix nft contract warnings

---
 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 ++--
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/contracts/nft/src/query/all_nft_info.rs b/contracts/nft/src/query/all_nft_info.rs
index 022831ea..08b835ac 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_binary, Binary, Deps, Env};
+use cosmwasm_std::{to_json_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_binary(&AllNftInfoResponse {
+    Ok(to_json_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 30ecb38f..201330e9 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_binary, Binary, Deps, Env, Order, StdResult};
+use cosmwasm_std::{to_json_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_binary(&OperatorsResponse { operators: res? })?)
+    Ok(to_json_binary(&OperatorsResponse { operators: res? })?)
 }
diff --git a/contracts/nft/src/query/all_tokens.rs b/contracts/nft/src/query/all_tokens.rs
index 2140bbb8..e2e9dc8a 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_binary, Binary, Deps, Order, StdResult};
+use cosmwasm_std::{to_json_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_binary(&TokensResponse { tokens: tokens? })?)
+    Ok(to_json_binary(&TokensResponse { tokens: tokens? })?)
 }
diff --git a/contracts/nft/src/query/approval.rs b/contracts/nft/src/query/approval.rs
index 2263f2e1..608ab1d7 100644
--- a/contracts/nft/src/query/approval.rs
+++ b/contracts/nft/src/query/approval.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_binary, Binary, Deps, Env, StdError};
+use cosmwasm_std::{to_json_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_binary(&ApprovalResponse { approval })?);
+        return Ok(to_json_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_binary(&ApprovalResponse { approval })?)
+    Ok(to_json_binary(&ApprovalResponse { approval })?)
 }
diff --git a/contracts/nft/src/query/approvals.rs b/contracts/nft/src/query/approvals.rs
index 80815bdc..373e2a40 100644
--- a/contracts/nft/src/query/approvals.rs
+++ b/contracts/nft/src/query/approvals.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_binary, Binary, Deps, Env};
+use cosmwasm_std::{to_json_binary, Binary, Deps, Env};
 use cw721::ApprovalsResponse;
 
 use crate::core::error::ContractError;
@@ -21,5 +21,5 @@ pub fn handle(
         })
         .collect();
 
-    Ok(to_binary(&ApprovalsResponse { approvals })?)
+    Ok(to_json_binary(&ApprovalsResponse { approvals })?)
 }
diff --git a/contracts/nft/src/query/contract_info.rs b/contracts/nft/src/query/contract_info.rs
index 4f6079fe..47a2548c 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_binary, Binary, Deps};
+use cosmwasm_std::{to_json_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_binary(&CONTRACT_INFO.load(deps.storage)?)?)
+    Ok(to_json_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 22676908..8a42d1e2 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_binary, Binary, Deps};
+use cosmwasm_std::{to_json_binary, Binary, Deps};
 
 use crate::core::error::ContractError;
 
 pub fn handle(deps: Deps) -> Result<Binary, ContractError> {
-    Ok(to_binary(&cw_ownable::get_ownership(deps.storage)?)?)
+    Ok(to_json_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 40b596d4..15476e06 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_binary, Binary, Deps};
+use cosmwasm_std::{to_json_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_binary(&res)?)
+    Ok(to_json_binary(&res)?)
 }
diff --git a/contracts/nft/src/query/minter.rs b/contracts/nft/src/query/minter.rs
index 24169ba0..7aaf8dfb 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_binary, Binary, Deps};
+use cosmwasm_std::{to_json_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_binary(&MinterResponse { minter })?)
+    Ok(to_json_binary(&MinterResponse { minter })?)
 }
diff --git a/contracts/nft/src/query/nft_info.rs b/contracts/nft/src/query/nft_info.rs
index c7baac53..5bb2d67f 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_binary, Binary, Deps, Env, QuerierWrapper, StdError};
+use cosmwasm_std::{to_json_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_binary(&NftInfoResponse {
+    Ok(to_json_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 ffe5910e..159970b3 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_binary, Binary, Deps};
+use cosmwasm_std::{to_json_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_binary(&NumTokensResponse { count })?)
+    Ok(to_json_binary(&NumTokensResponse { count })?)
 }
diff --git a/contracts/nft/src/query/operator.rs b/contracts/nft/src/query/operator.rs
index 19f3326d..831e6161 100644
--- a/contracts/nft/src/query/operator.rs
+++ b/contracts/nft/src/query/operator.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_binary, Binary, Deps, Env, StdError};
+use cosmwasm_std::{to_json_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_binary(&OperatorResponse {
+        return Ok(to_json_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 cc6f4ae8..4a21cf3e 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_binary, Binary, Deps, Env};
+use cosmwasm_std::{to_json_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_binary(&OwnerOfResponse {
+    Ok(to_json_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 caa8ce79..339f5c79 100644
--- a/contracts/nft/src/query/tokens.rs
+++ b/contracts/nft/src/query/tokens.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_binary, Binary, Deps, Order, StdResult};
+use cosmwasm_std::{to_json_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_binary(&TokensResponse { tokens })?)
+    Ok(to_json_binary(&TokensResponse { tokens })?)
 }

From 2297c078ffa58f3fabcd7f8520bcaf1d3427f4ce Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:04:28 -0500
Subject: [PATCH 22/64] fix scope contract warnings

---
 contracts/scope/src/contract.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/contracts/scope/src/contract.rs b/contracts/scope/src/contract.rs
index c4b8e69b..0c1c5cbf 100644
--- a/contracts/scope/src/contract.rs
+++ b/contracts/scope/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
+    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
 };
 use provwasm_std::types::provenance::metadata::v1::{MetadataQuerier, MsgWriteScopeRequest, Scope};
 use provwasm_std::types::provenance::name::v1::{MsgBindNameRequest, NameRecord};
@@ -101,14 +101,14 @@ 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)?;
-    to_binary(&contract_spec_response)
+    to_json_binary(&contract_spec_response)
 }
 
 // Use a ProvenanceQuerier to get a scope by ID.
 fn try_get_scope(deps: Deps, id: String) -> Result<QueryResponse, StdError> {
     let querier = MetadataQuerier::new(&deps.querier);
     let scope_response = querier.scope(id, "".to_string(), "".to_string(), false, false)?;
-    to_binary(&scope_response)
+    to_json_binary(&scope_response)
 }
 
 // Use a ProvenanceQuerier to get sessions for a scope.
@@ -122,7 +122,7 @@ fn try_get_sessions(deps: Deps, scope_id: String) -> Result<QueryResponse, StdEr
         false,
         false,
     )?;
-    to_binary(&sessions_response)
+    to_json_binary(&sessions_response)
 }
 
 // Use a ProvenanceQuerier to get records for a scope.
@@ -136,7 +136,7 @@ fn try_get_records(deps: Deps, scope_id: String) -> Result<QueryResponse, StdErr
         false,
         false,
     )?;
-    to_binary(&records_response)
+    to_json_binary(&records_response)
 }
 
 // Use a ProvenanceQuerier to get records for a scope by name
@@ -148,13 +148,13 @@ fn try_get_records_by_name(
     let querier = MetadataQuerier::new(&deps.querier);
     let records_response =
         querier.records("".to_string(), scope_id, "".to_string(), name, false, false)?;
-    to_binary(&records_response)
+    to_json_binary(&records_response)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use cosmwasm_std::from_binary;
+    use cosmwasm_std::from_json;
     use cosmwasm_std::testing::{mock_env, mock_info};
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::metadata::v1::process::ProcessId;
@@ -229,7 +229,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected scope.
-        let scope: ScopeResponse = from_binary(&bin).unwrap();
+        let scope: ScopeResponse = from_json(&bin).unwrap();
         assert_eq!(scope, expected)
     }
 
@@ -280,7 +280,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected sessions.
-        let sessions: SessionsResponse = from_binary(&bin).unwrap();
+        let sessions: SessionsResponse = from_json(&bin).unwrap();
         assert_eq!(sessions, expected)
     }
 
@@ -377,7 +377,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected records
-        let records: RecordsResponse = from_binary(&bin).unwrap();
+        let records: RecordsResponse = from_json(&bin).unwrap();
         assert_eq!(records, expected)
     }
 
@@ -441,7 +441,7 @@ mod tests {
         .unwrap();
 
         // Ensure we got the expected record.
-        let record: RecordsResponse = from_binary(&bin).unwrap();
+        let record: RecordsResponse = from_json(&bin).unwrap();
         assert_eq!(record, expected);
     }
 }

From 5ba94da951b11574e5961b8a8cd710af253007f9 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 31 Jan 2024 13:43:20 -0500
Subject: [PATCH 23/64] fix template contract warnings

---
 contracts/template/src/query/query_owner.rs   | 8 ++++----
 contracts/template/src/query/query_version.rs | 8 ++++----
 contracts/template/src/query/router.rs        | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contracts/template/src/query/query_owner.rs b/contracts/template/src/query/query_owner.rs
index f72e4d37..4875e563 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_binary, Deps};
+use cosmwasm_std::{to_json_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_binary(&res)?)
+    Ok(to_json_binary(&res)?)
 }
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::{from_binary, Addr};
+    use cosmwasm_std::{from_json, 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_binary(&bin).unwrap();
+        let response: QueryOwnerResponse = from_json(&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 9e2e2616..c67a26a8 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_binary, Deps};
+use cosmwasm_std::{to_json_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_binary(&res)?)
+    Ok(to_json_binary(&res)?)
 }
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::from_binary;
+    use cosmwasm_std::from_json;
     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_binary(&bin).unwrap();
+        let response: QueryVersionResponse = from_json(&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 94494d59..93d60faa 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_binary, testing::mock_env, Addr};
+    use cosmwasm_std::{from_json, 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_binary(&bin).unwrap();
+        let response: QueryOwnerResponse = from_json(&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_binary(&bin).unwrap();
+        let response: QueryVersionResponse = from_json(&bin).unwrap();
         assert_eq!(CONTRACT_NAME, response.contract_version.contract);
         assert_eq!(CONTRACT_VERSION, response.contract_version.version);
     }

From 783abf365e6e9462f24ad3daa1680d46b0e68269 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:41:11 -0500
Subject: [PATCH 24/64] fix trigger contract warnings

---
 contracts/trigger/src/contract.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/trigger/src/contract.rs b/contracts/trigger/src/contract.rs
index 0d47ee9e..864d153f 100644
--- a/contracts/trigger/src/contract.rs
+++ b/contracts/trigger/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, Uint64,
+    entry_point, to_json_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_binary(&trigger_querier.trigger_by_id(id.u64())?)?),
-        None => Ok(to_binary(&trigger_querier.triggers(None)?)?),
+        Some(id) => Ok(to_json_binary(&trigger_querier.trigger_by_id(id.u64())?)?),
+        None => Ok(to_json_binary(&trigger_querier.triggers(None)?)?),
     }
 }
 

From b63bf673e9000a38ade9b2d37d93aaece740d936 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:59:07 -0500
Subject: [PATCH 25/64] fix tutorial contract warnings

---
 contracts/tutorial/src/contract.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/tutorial/src/contract.rs b/contracts/tutorial/src/contract.rs
index db40f94c..7e04091b 100644
--- a/contracts/tutorial/src/contract.rs
+++ b/contracts/tutorial/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    coin, entry_point, to_binary, BankMsg, Binary, CosmosMsg, Decimal, Deps, DepsMut, Env,
+    coin, entry_point, to_json_binary, BankMsg, Binary, CosmosMsg, Decimal, Deps, DepsMut, Env,
     MessageInfo, Response, StdError, StdResult,
 };
 use provwasm_std::types::provenance::name::v1::{MsgBindNameRequest, NameRecord};
@@ -90,7 +90,7 @@ pub fn query(
     match msg {
         QueryMsg::QueryRequest {} => {
             let state = config_read(deps.storage).load()?;
-            let json = to_binary(&state)?;
+            let json = to_json_binary(&state)?;
             Ok(json)
         }
     }
@@ -177,7 +177,7 @@ fn try_purchase(
 // mod tests {
 //     use super::*;
 //     use cosmwasm_std::testing::{mock_env, mock_info};
-//     use cosmwasm_std::{from_binary, Addr};
+//     use cosmwasm_std::{from_json, Addr};
 //     use provwasm_mocks::mock_dependencies;
 //     use provwasm_std::{NameMsgParams, ProvenanceMsgParams};
 //
@@ -291,7 +291,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_binary(&bin).unwrap();
+//         let resp: State = from_json(&bin).unwrap();
 //
 //         // Ensure the expected init fields were properly stored.
 //         assert_eq!(resp.merchant_address, Addr::unchecked("merchant"));

From 3753bddda89622fbe7395d745e30f16426e6cb31 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:33:09 -0500
Subject: [PATCH 26/64] update Makefile for new project workspace

---
 Makefile | 60 +++++++++++---------------------------------------------
 1 file changed, 11 insertions(+), 49 deletions(-)

diff --git a/Makefile b/Makefile
index 91d45c43..cde28fb8 100644
--- a/Makefile
+++ b/Makefile
@@ -42,53 +42,15 @@ name:
 scope:
 	@make -C contracts/scope
 
-.PHONY: build-release-zip
-build-release-zip: tutorial
-	zip provwasm_tutorial.zip ./contracts/tutorial/artifacts/provwasm_tutorial.wasm
-
-PROVENANCE_TEST_VERSION = "v1.8.0"
-
-.PHONY: test-tutorial
-test-tutorial: tutorial optimize-tutorial
-	docker rm -f test_container || true
-	docker pull provenanceio/provenance-testing-action
-	docker create --name test_container provenanceio/provenance-testing-action --entrypoint	"/scripts/tutorial_test.sh" "$(PROVENANCE_TEST_VERSION)"
-	docker cp ./scripts test_container:/scripts
-	docker cp ./contracts test_container:/go/contracts
-	docker start test_container
-
-.PHONY: test-attrs
+.PHONY: optimize-contracts
 test-attrs: attrs
-	docker rm -f test_container || true
-	docker pull provenanceio/provenance-testing-action
-	docker create --name test_container provenanceio/provenance-testing-action --entrypoint	"/scripts/attrs_test.sh" "$(PROVENANCE_TEST_VERSION)"
-	docker cp ./scripts test_container:/scripts
-	docker cp ./contracts test_container:/go/contracts
-	docker start test_container
-
-.PHONY: test-marker
-test-marker: marker
-	docker rm -f test_container || true
-	docker pull provenanceio/provenance-testing-action
-	docker create --name test_container provenanceio/provenance-testing-action --entrypoint	"/scripts/marker_test.sh" "$(PROVENANCE_TEST_VERSION)"
-	docker cp ./scripts test_container:/scripts
-	docker cp ./contracts test_container:/go/contracts
-	docker start test_container
-
-.PHONY: test-name
-test-name: name
-	docker rm -f test_container || true
-	docker pull provenanceio/provenance-testing-action
-	docker create --name test_container provenanceio/provenance-testing-action --entrypoint	"/scripts/name_test.sh" "$(PROVENANCE_TEST_VERSION)"
-	docker cp ./scripts test_container:/scripts
-	docker cp ./contracts test_container:/go/contracts
-	docker start test_container
-
-.PHONY: test-scope
-test-scope: scope
-	docker rm -f test_container || true
-	docker pull provenanceio/provenance-testing-action
-	docker create --name test_container provenanceio/provenance-testing-action --entrypoint	"/scripts/scope_test.sh" "$(PROVENANCE_TEST_VERSION)"
-	docker cp ./scripts test_container:/scripts
-	docker cp ./contracts test_container:/go/contracts
-	docker start test_container
\ No newline at end of file
+	if [[ $(arch) == "arm64" ]]; then
+	  image="cosmwasm/workspace-optimizer-arm64"
+	else
+	  image="cosmwasm/workspace-optimizer"
+	fi
+
+	docker run --rm -v "$(pwd)":/code:Z \
+	  --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
+	  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+	  ${image}:0.12.13

From 23dec9de717a448e8f3f96cda3684b39d6d6607b Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Thu, 1 Feb 2024 10:25:36 -0500
Subject: [PATCH 27/64] bump provenance to 1.17.1

---
 packages/proto-build/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/proto-build/src/main.rs b/packages/proto-build/src/main.rs
index f32956bc..a0428d3e 100644
--- a/packages/proto-build/src/main.rs
+++ b/packages/proto-build/src/main.rs
@@ -10,7 +10,7 @@ use proto_build::{
 };
 
 /// The provenance commit or tag to be cloned and used to build the proto files
-const PROVENANCE_REV: &str = "v1.17.0-rc1";
+const PROVENANCE_REV: &str = "v1.17.1";
 
 // All paths must end with a / and either be absolute or include a ./ to reference the current
 // working directory.

From df7fe69317f6f4ce2be4cd42fccefd6d071e33bc Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:32:03 -0500
Subject: [PATCH 28/64] add missing provenance proto message types

---
 packages/proto-build/provenance.buf.gen.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/proto-build/provenance.buf.gen.yaml b/packages/proto-build/provenance.buf.gen.yaml
index 29c4868d..032015be 100644
--- a/packages/proto-build/provenance.buf.gen.yaml
+++ b/packages/proto-build/provenance.buf.gen.yaml
@@ -193,6 +193,7 @@ types:
     - provenance.marker.v1.MsgWithdrawResponse
     - provenance.marker.v1.MsgTransferRequest
     - provenance.marker.v1.MsgTransferResponse
+    - provenance.marker.v1.MsgIbcTransferRequest
     - provenance.marker.v1.MsgIbcTransferResponse
     - provenance.marker.v1.MsgSetDenomMetadataRequest
     - provenance.marker.v1.MsgSetDenomMetadataResponse
@@ -333,6 +334,10 @@ types:
     - provenance.msgfees.v1.Params
     - provenance.msgfees.v1.QueryParamsRequest
     - provenance.msgfees.v1.QueryParamsResponse
+    - provenance.msgfees.v1.QueryAllMsgFeesRequest
+    - provenance.msgfees.v1.QueryAllMsgFeesResponse
+    - provenance.msgfees.v1.CalculateTxFeesRequest
+    - provenance.msgfees.v1.CalculateTxFeesResponse
     - provenance.msgfees.v1.MsgAssessCustomMsgFeeRequest
     - provenance.msgfees.v1.MsgAssessCustomMsgFeeResponse
     - provenance.name.v1.Params

From c76f1c4c5393cccad688e76063aeb7387ff85875 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:51:46 -0500
Subject: [PATCH 29/64] remove unsupported 3rd party proto message types

---
 packages/proto-build/third-party.buf.gen.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/proto-build/third-party.buf.gen.yaml b/packages/proto-build/third-party.buf.gen.yaml
index 809e9f47..129a6177 100644
--- a/packages/proto-build/third-party.buf.gen.yaml
+++ b/packages/proto-build/third-party.buf.gen.yaml
@@ -65,8 +65,6 @@ types:
     - cosmos.gov.v1beta1.MsgSubmitProposalResponse
     - cosmos.gov.v1beta1.MsgVote
     - cosmos.gov.v1beta1.MsgVoteResponse
-    - cosmos.gov.v1beta1.QueryProposalRequest
-    - cosmos.gov.v1beta1.QueryProposalResponse
     - cosmos.gov.v1beta1.QueryDepositRequest
     - cosmos.gov.v1beta1.QueryDepositResponse
     - cosmos.gov.v1beta1.QueryParamsRequest

From 13ba635ee5a557f29f58ad194342265e18bfb9b0 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 14:40:12 -0600
Subject: [PATCH 30/64] update submodule and checkout hash

---
 dependencies/provenance                           | 2 +-
 packages/provwasm-std/src/types/PROVENANCE_COMMIT | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies/provenance b/dependencies/provenance
index 5edcbb25..7b165708 160000
--- a/dependencies/provenance
+++ b/dependencies/provenance
@@ -1 +1 @@
-Subproject commit 5edcbb258e45c1d6b07903418b9471150d654b71
+Subproject commit 7b165708ccd30b98df0ac47fd541f572bcf2f001
diff --git a/packages/provwasm-std/src/types/PROVENANCE_COMMIT b/packages/provwasm-std/src/types/PROVENANCE_COMMIT
index b0c8beb6..34779d0c 100644
--- a/packages/provwasm-std/src/types/PROVENANCE_COMMIT
+++ b/packages/provwasm-std/src/types/PROVENANCE_COMMIT
@@ -1 +1 @@
-v1.17.0-rc1
\ No newline at end of file
+v1.17.1
\ No newline at end of file

From 05557031f149c4e1015493affc2bd3fb7921fd4c Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:37:25 -0600
Subject: [PATCH 31/64] remove params msgs from buf.gen

---
 packages/proto-build/provenance.buf.gen.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/proto-build/provenance.buf.gen.yaml b/packages/proto-build/provenance.buf.gen.yaml
index 032015be..8d443163 100644
--- a/packages/proto-build/provenance.buf.gen.yaml
+++ b/packages/proto-build/provenance.buf.gen.yaml
@@ -8,7 +8,6 @@ plugins:
       - extern_path=.google.protobuf.Any=crate::shim::Any
 types:
   include:
-    - provenance.attribute.v1.Params
     - provenance.attribute.v1.Attribute
     - provenance.attribute.v1.AttributeType
     - provenance.attribute.v1.EventAttributeAdd
@@ -46,7 +45,6 @@ types:
     - provenance.exchange.v1.EventMarketReqAttrUpdated
     - provenance.exchange.v1.EventMarketCreated
     - provenance.exchange.v1.EventMarketFeesUpdated
-    - provenance.exchange.v1.EventParamsUpdated
     - provenance.exchange.v1.MarketAccount
     - provenance.exchange.v1.MarketDetails
     - provenance.exchange.v1.MarketBrief
@@ -57,7 +55,6 @@ types:
     - provenance.exchange.v1.Order
     - provenance.exchange.v1.AskOrder
     - provenance.exchange.v1.BidOrder
-    - provenance.exchange.v1.Params
     - provenance.exchange.v1.DenomSplit
     - provenance.exchange.v1.QueryOrderFeeCalcRequest
     - provenance.exchange.v1.QueryOrderFeeCalcResponse
@@ -127,7 +124,6 @@ types:
     - provenance.marker.v1.AccessGrant
     - provenance.marker.v1.Access
     - provenance.marker.v1.MarkerTransferAuthorization
-    - provenance.marker.v1.Params
     - provenance.marker.v1.MarkerAccount
     - provenance.marker.v1.MarkerType
     - provenance.marker.v1.MarkerStatus
@@ -223,7 +219,6 @@ types:
     - provenance.metadata.v1.EventOSLocatorCreated
     - provenance.metadata.v1.EventOSLocatorUpdated
     - provenance.metadata.v1.EventOSLocatorDeleted
-    - provenance.metadata.v1.Params
     - provenance.metadata.v1.ScopeIdInfo
     - provenance.metadata.v1.SessionIdInfo
     - provenance.metadata.v1.RecordIdInfo
@@ -331,7 +326,6 @@ types:
     - provenance.msgfees.v1.EventMsgFee
     - provenance.msgfees.v1.EventMsgFees
     - provenance.msgfees.v1.MsgFee
-    - provenance.msgfees.v1.Params
     - provenance.msgfees.v1.QueryParamsRequest
     - provenance.msgfees.v1.QueryParamsResponse
     - provenance.msgfees.v1.QueryAllMsgFeesRequest
@@ -340,7 +334,6 @@ types:
     - provenance.msgfees.v1.CalculateTxFeesResponse
     - provenance.msgfees.v1.MsgAssessCustomMsgFeeRequest
     - provenance.msgfees.v1.MsgAssessCustomMsgFeeResponse
-    - provenance.name.v1.Params
     - provenance.name.v1.NameRecord
     - provenance.name.v1.CreateRootNameProposal
     - provenance.name.v1.EventNameBound

From 10915c82c125f880267f0cd2a3d215747856c943 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:37:47 -0600
Subject: [PATCH 32/64] add ibc msg types to buf.gen

---
 packages/proto-build/third-party.buf.gen.yaml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/proto-build/third-party.buf.gen.yaml b/packages/proto-build/third-party.buf.gen.yaml
index 129a6177..2c1d3fe0 100644
--- a/packages/proto-build/third-party.buf.gen.yaml
+++ b/packages/proto-build/third-party.buf.gen.yaml
@@ -90,4 +90,18 @@ types:
     - cosmos.upgrade.v1beta1.SoftwareUpgradeProposal
     - cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal
     - cosmos.upgrade.v1beta1.ModuleVersion
-    - cosmwasm.wasm.v1
\ No newline at end of file
+    - cosmwasm.wasm.v1
+    - ibc.applications.fee.v1.MsgRegisterPayee
+    - ibc.applications.fee.v1.MsgRegisterPayeeResponse
+    - ibc.applications.fee.v1.MsgRegisterCounterpartyPayee
+    - ibc.applications.fee.v1.MsgRegisterCounterpartyPayeeResponse
+    - ibc.applications.fee.v1.MsgPayPacketFee
+    - ibc.applications.fee.v1.MsgPayPacketFeeResponse
+    - ibc.applications.fee.v1.MsgPayPacketFeeAsync
+    - ibc.applications.fee.v1.MsgPayPacketFeeAsyncResponse
+    - ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount
+    - ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccountResponse
+    - ibc.applications.interchain_accounts.controller.v1.MsgSendTx
+    - ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse
+    - ibc.applications.transfer.v1.MsgTransfer
+    - ibc.applications.transfer.v1.MsgTransferResponse
\ No newline at end of file

From 59643ed13a2d86131a024c0cbff3253b47c6af9b Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:38:26 -0600
Subject: [PATCH 33/64] add ibc msg types

---
 .../src/types/ibc/applications/fee/mod.rs     |   1 +
 .../src/types/ibc/applications/fee/v1.rs      | 187 ++++++++++++++++++
 .../interchain_accounts/controller/mod.rs     |   1 +
 .../interchain_accounts/controller/v1.rs      |  94 +++++++++
 .../applications/interchain_accounts/mod.rs   |   2 +
 .../applications/interchain_accounts/v1.rs    |  77 ++++++++
 .../src/types/ibc/applications/mod.rs         |   3 +
 .../types/ibc/applications/transfer/mod.rs    |   1 +
 .../src/types/ibc/applications/transfer/v1.rs |  62 ++++++
 .../src/types/ibc/core/channel/mod.rs         |   1 +
 .../src/types/ibc/core/channel/v1.rs          |  32 +++
 .../src/types/ibc/core/client/mod.rs          |   1 +
 .../src/types/ibc/core/client/v1.rs           |  34 ++++
 .../provwasm-std/src/types/ibc/core/mod.rs    |   2 +
 packages/provwasm-std/src/types/ibc/mod.rs    |   2 +
 15 files changed, 500 insertions(+)
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/fee/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/fee/v1.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/interchain_accounts/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/interchain_accounts/v1.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/transfer/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/core/channel/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/core/channel/v1.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/core/client/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/core/client/v1.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/core/mod.rs
 create mode 100644 packages/provwasm-std/src/types/ibc/mod.rs

diff --git a/packages/provwasm-std/src/types/ibc/applications/fee/mod.rs b/packages/provwasm-std/src/types/ibc/applications/fee/mod.rs
new file mode 100644
index 00000000..a3a6d96c
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/fee/mod.rs
@@ -0,0 +1 @@
+pub mod v1;
diff --git a/packages/provwasm-std/src/types/ibc/applications/fee/v1.rs b/packages/provwasm-std/src/types/ibc/applications/fee/v1.rs
new file mode 100644
index 00000000..65954fea
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/fee/v1.rs
@@ -0,0 +1,187 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.Fee")]
+#[serde(rename_all = "snake_case")]
+pub struct Fee {
+    #[prost(message, repeated, tag = "1")]
+    pub recv_fee: ::prost::alloc::vec::Vec<super::super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(message, repeated, tag = "2")]
+    pub ack_fee: ::prost::alloc::vec::Vec<super::super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(message, repeated, tag = "3")]
+    pub timeout_fee:
+        ::prost::alloc::vec::Vec<super::super::super::super::cosmos::base::v1beta1::Coin>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.PacketFee")]
+#[serde(rename_all = "snake_case")]
+pub struct PacketFee {
+    #[prost(message, optional, tag = "1")]
+    pub fee: ::core::option::Option<Fee>,
+    #[prost(string, tag = "2")]
+    pub refund_address: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "3")]
+    pub relayers: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgRegisterPayee")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRegisterPayee {
+    #[prost(string, tag = "1")]
+    pub port_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub channel_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub relayer: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub payee: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgRegisterPayeeResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRegisterPayeeResponse {}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgRegisterCounterpartyPayee")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRegisterCounterpartyPayee {
+    #[prost(string, tag = "1")]
+    pub port_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub channel_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub relayer: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub counterparty_payee: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgRegisterCounterpartyPayeeResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRegisterCounterpartyPayeeResponse {}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgPayPacketFee")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgPayPacketFee {
+    #[prost(message, optional, tag = "1")]
+    pub fee: ::core::option::Option<Fee>,
+    #[prost(string, tag = "2")]
+    pub source_port_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub source_channel_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub signer: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "5")]
+    pub relayers: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgPayPacketFeeResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgPayPacketFeeResponse {}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgPayPacketFeeAsync")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgPayPacketFeeAsync {
+    #[prost(message, optional, tag = "1")]
+    pub packet_id: ::core::option::Option<super::super::super::core::channel::v1::PacketId>,
+    #[prost(message, optional, tag = "2")]
+    pub packet_fee: ::core::option::Option<PacketFee>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.fee.v1.MsgPayPacketFeeAsyncResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgPayPacketFeeAsyncResponse {}
+pub struct FeeQuerier<'a, Q: cosmwasm_std::CustomQuery> {
+    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
+}
+impl<'a, Q: cosmwasm_std::CustomQuery> FeeQuerier<'a, Q> {
+    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
+        Self { querier }
+    }
+}
diff --git a/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/mod.rs b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/mod.rs
new file mode 100644
index 00000000..a3a6d96c
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/mod.rs
@@ -0,0 +1 @@
+pub mod v1;
diff --git a/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs
new file mode 100644
index 00000000..f6c79e33
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs
@@ -0,0 +1,94 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(
+    type_url = "/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount"
+)]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRegisterInterchainAccount {
+    #[prost(string, tag = "1")]
+    pub owner: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub connection_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub version: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(
+    type_url = "/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccountResponse"
+)]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRegisterInterchainAccountResponse {
+    #[prost(string, tag = "1")]
+    pub channel_id: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.interchain_accounts.controller.v1.MsgSendTx")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgSendTx {
+    #[prost(string, tag = "1")]
+    pub owner: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub connection_id: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "3")]
+    pub packet_data: ::core::option::Option<super::super::v1::InterchainAccountPacketData>,
+    #[prost(uint64, tag = "4")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub relative_timeout: u64,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgSendTxResponse {
+    #[prost(uint64, tag = "1")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub sequence: u64,
+}
+pub struct ControllerQuerier<'a, Q: cosmwasm_std::CustomQuery> {
+    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
+}
+impl<'a, Q: cosmwasm_std::CustomQuery> ControllerQuerier<'a, Q> {
+    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
+        Self { querier }
+    }
+}
diff --git a/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/mod.rs b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/mod.rs
new file mode 100644
index 00000000..dd3c16f9
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/mod.rs
@@ -0,0 +1,2 @@
+pub mod controller;
+pub mod v1;
diff --git a/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/v1.rs b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/v1.rs
new file mode 100644
index 00000000..5bd4865e
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/v1.rs
@@ -0,0 +1,77 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.interchain_accounts.v1.InterchainAccountPacketData")]
+#[serde(rename_all = "snake_case")]
+pub struct InterchainAccountPacketData {
+    #[prost(enumeration = "Type", tag = "1")]
+    #[serde(
+        serialize_with = "Type::serialize",
+        deserialize_with = "Type::deserialize"
+    )]
+    pub r#type: i32,
+    #[prost(bytes = "vec", tag = "2")]
+    #[serde(
+        serialize_with = "crate::serde::as_base64::serialize",
+        deserialize_with = "crate::serde::as_base64::deserialize"
+    )]
+    pub data: ::prost::alloc::vec::Vec<u8>,
+    #[prost(string, tag = "3")]
+    pub memo: ::prost::alloc::string::String,
+}
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+#[derive(strum_macros::FromRepr, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum Type {
+    Unspecified = 0,
+    ExecuteTx = 1,
+}
+impl Type {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            Type::Unspecified => "TYPE_UNSPECIFIED",
+            Type::ExecuteTx => "TYPE_EXECUTE_TX",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "TYPE_UNSPECIFIED" => Some(Self::Unspecified),
+            "TYPE_EXECUTE_TX" => Some(Self::ExecuteTx),
+            _ => None,
+        }
+    }
+    pub fn serialize<S>(v: &i32, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let enum_value = Self::from_repr(*v);
+        match enum_value {
+            Some(v) => serializer.serialize_str(v.as_str_name()),
+            None => Err(serde::ser::Error::custom("unknown value")),
+        }
+    }
+    pub fn deserialize<'de, D>(deserializer: D) -> std::result::Result<i32, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        use serde::de::Deserialize;
+        let s = String::deserialize(deserializer)?;
+        match Self::from_str_name(&s) {
+            Some(v) => Ok(v.into()),
+            None => Err(serde::de::Error::custom("unknown value")),
+        }
+    }
+}
diff --git a/packages/provwasm-std/src/types/ibc/applications/mod.rs b/packages/provwasm-std/src/types/ibc/applications/mod.rs
new file mode 100644
index 00000000..a56db2d8
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/mod.rs
@@ -0,0 +1,3 @@
+pub mod fee;
+pub mod interchain_accounts;
+pub mod transfer;
diff --git a/packages/provwasm-std/src/types/ibc/applications/transfer/mod.rs b/packages/provwasm-std/src/types/ibc/applications/transfer/mod.rs
new file mode 100644
index 00000000..a3a6d96c
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/transfer/mod.rs
@@ -0,0 +1 @@
+pub mod v1;
diff --git a/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs b/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
new file mode 100644
index 00000000..47ce4355
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
@@ -0,0 +1,62 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.transfer.v1.MsgTransfer")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgTransfer {
+    #[prost(string, tag = "1")]
+    pub source_port: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub source_channel: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "3")]
+    pub token: ::core::option::Option<super::super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "4")]
+    pub sender: ::prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub receiver: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "6")]
+    pub timeout_height: ::core::option::Option<super::super::super::core::client::v1::Height>,
+    #[prost(uint64, tag = "7")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub timeout_timestamp: u64,
+    #[prost(string, tag = "8")]
+    pub memo: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.transfer.v1.MsgTransferResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgTransferResponse {
+    #[prost(uint64, tag = "1")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub sequence: u64,
+}
+pub struct TransferQuerier<'a, Q: cosmwasm_std::CustomQuery> {
+    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
+}
+impl<'a, Q: cosmwasm_std::CustomQuery> TransferQuerier<'a, Q> {
+    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
+        Self { querier }
+    }
+}
diff --git a/packages/provwasm-std/src/types/ibc/core/channel/mod.rs b/packages/provwasm-std/src/types/ibc/core/channel/mod.rs
new file mode 100644
index 00000000..a3a6d96c
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/core/channel/mod.rs
@@ -0,0 +1 @@
+pub mod v1;
diff --git a/packages/provwasm-std/src/types/ibc/core/channel/v1.rs b/packages/provwasm-std/src/types/ibc/core/channel/v1.rs
new file mode 100644
index 00000000..5a009335
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/core/channel/v1.rs
@@ -0,0 +1,32 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.core.channel.v1.PacketId")]
+#[serde(rename_all = "snake_case")]
+pub struct PacketId {
+    #[prost(string, tag = "1")]
+    pub port_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub channel_id: ::prost::alloc::string::String,
+    #[prost(uint64, tag = "3")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub sequence: u64,
+}
+pub struct ChannelQuerier<'a, Q: cosmwasm_std::CustomQuery> {
+    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
+}
+impl<'a, Q: cosmwasm_std::CustomQuery> ChannelQuerier<'a, Q> {
+    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
+        Self { querier }
+    }
+}
diff --git a/packages/provwasm-std/src/types/ibc/core/client/mod.rs b/packages/provwasm-std/src/types/ibc/core/client/mod.rs
new file mode 100644
index 00000000..a3a6d96c
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/core/client/mod.rs
@@ -0,0 +1 @@
+pub mod v1;
diff --git a/packages/provwasm-std/src/types/ibc/core/client/v1.rs b/packages/provwasm-std/src/types/ibc/core/client/v1.rs
new file mode 100644
index 00000000..95ac5070
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/core/client/v1.rs
@@ -0,0 +1,34 @@
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.core.client.v1.Height")]
+#[serde(rename_all = "snake_case")]
+pub struct Height {
+    #[prost(uint64, tag = "1")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub revision_number: u64,
+    #[prost(uint64, tag = "2")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub revision_height: u64,
+}
+pub struct ClientQuerier<'a, Q: cosmwasm_std::CustomQuery> {
+    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
+}
+impl<'a, Q: cosmwasm_std::CustomQuery> ClientQuerier<'a, Q> {
+    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
+        Self { querier }
+    }
+}
diff --git a/packages/provwasm-std/src/types/ibc/core/mod.rs b/packages/provwasm-std/src/types/ibc/core/mod.rs
new file mode 100644
index 00000000..3100491c
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/core/mod.rs
@@ -0,0 +1,2 @@
+pub mod channel;
+pub mod client;
diff --git a/packages/provwasm-std/src/types/ibc/mod.rs b/packages/provwasm-std/src/types/ibc/mod.rs
new file mode 100644
index 00000000..36991fc0
--- /dev/null
+++ b/packages/provwasm-std/src/types/ibc/mod.rs
@@ -0,0 +1,2 @@
+pub mod applications;
+pub mod core;

From ad637a3c8e7737b570bb15c4b477ab909dfaa76a Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:41:09 -0600
Subject: [PATCH 34/64] remove deprecated v1 provwasm bindings

---
 packages/provwasm-mocks/src/attribute.rs | 217 ------
 packages/provwasm-mocks/src/common.rs    |  31 -
 packages/provwasm-mocks/src/lib.rs       |  24 +-
 packages/provwasm-mocks/src/marker.rs    | 136 ----
 packages/provwasm-mocks/src/metadata.rs  | 155 ----
 packages/provwasm-mocks/src/name.rs      | 138 ----
 packages/provwasm-mocks/src/querier.rs   | 149 +---
 packages/provwasm-std/src/lib.rs         |  33 -
 packages/provwasm-std/src/msg.rs         | 901 -----------------------
 packages/provwasm-std/src/querier.rs     | 370 ----------
 packages/provwasm-std/src/query.rs       |  74 --
 packages/provwasm-std/src/types/mod.rs   | 342 +--------
 12 files changed, 12 insertions(+), 2558 deletions(-)
 delete mode 100644 packages/provwasm-mocks/src/attribute.rs
 delete mode 100644 packages/provwasm-mocks/src/common.rs
 delete mode 100644 packages/provwasm-mocks/src/marker.rs
 delete mode 100644 packages/provwasm-mocks/src/metadata.rs
 delete mode 100644 packages/provwasm-mocks/src/name.rs
 delete mode 100644 packages/provwasm-std/src/msg.rs
 delete mode 100644 packages/provwasm-std/src/querier.rs
 delete mode 100644 packages/provwasm-std/src/query.rs

diff --git a/packages/provwasm-mocks/src/attribute.rs b/packages/provwasm-mocks/src/attribute.rs
deleted file mode 100644
index 5116f43b..00000000
--- a/packages/provwasm-mocks/src/attribute.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use crate::common::query_result;
-use cosmwasm_std::{to_binary, Addr, Binary, QuerierResult};
-use provwasm_std::{Attribute, AttributeQueryParams, AttributeValueType, Attributes};
-use std::collections::HashMap;
-
-/// A mock for testing provenance account attribute queries.
-#[deprecated(since = "2.0.0")]
-#[derive(Clone, Default)]
-pub struct AttributeQuerier {
-    records: HashMap<Addr, Vec<Attribute>>,
-}
-
-// Helper function to convert string to attribute value type.
-#[deprecated(since = "2.0.0")]
-fn determine_attr_type(typ: &str) -> AttributeValueType {
-    if typ == "json" {
-        AttributeValueType::Json
-    } else if typ == "bytes" {
-        AttributeValueType::Bytes
-    } else if typ == "uuid" {
-        AttributeValueType::Uuid
-    } else if typ == "uri" {
-        AttributeValueType::Uri
-    } else if typ == "proto" {
-        AttributeValueType::Proto
-    } else if typ == "int" {
-        AttributeValueType::Int
-    } else if typ == "float" {
-        AttributeValueType::Float
-    } else {
-        AttributeValueType::String
-    }
-}
-
-impl AttributeQuerier {
-    pub fn new(address: &str, inputs: &[(&str, &str, &str)]) -> Self {
-        let mut records = HashMap::new();
-        let mut attrs = vec![];
-        for (n, v, t) in inputs.iter() {
-            let name = (*n).to_string();
-            let value = (*v).to_string();
-            attrs.push(Attribute {
-                name,
-                value: Binary::from(value.as_bytes()),
-                value_type: determine_attr_type(t),
-            });
-        }
-        records.insert(Addr::unchecked(address), attrs);
-        AttributeQuerier { records }
-    }
-
-    fn get_attributes_by_name(&self, address: &Addr, name: &str) -> Attributes {
-        Attributes {
-            address: address.clone(),
-            attributes: self
-                .records
-                .get(address)
-                .map(|attrs| {
-                    attrs
-                        .iter()
-                        .filter(|r| r.name.to_lowercase() == *name.to_lowercase())
-                        .cloned()
-                        .collect()
-                })
-                .unwrap_or_else(Vec::new),
-        }
-    }
-
-    fn get_attributes(&self, address: &Addr) -> Attributes {
-        Attributes {
-            address: address.clone(),
-            attributes: self.records.get(address).unwrap_or(&vec![]).to_vec(),
-        }
-    }
-
-    pub fn query(&self, params: &AttributeQueryParams) -> QuerierResult {
-        let attributes = match params {
-            AttributeQueryParams::GetAttributes { address, name } => {
-                self.get_attributes_by_name(address, name)
-            }
-            AttributeQueryParams::GetAllAttributes { address } => self.get_attributes(address),
-        };
-        query_result(to_binary(&attributes))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use cosmwasm_std::from_binary;
-    use provwasm_std::{AttributeQueryParams, Attributes};
-
-    #[test]
-    fn get_attributes() {
-        let querier = AttributeQuerier::new(
-            "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync",
-            &[
-                ("id", "88202946-4447-401c-b38c-75c46d8b5692", "uuid"),
-                ("profile", "dd152f91-e39f-4c17-9ebf-6eb534ec61e5", "uuid"),
-            ],
-        );
-
-        let params = AttributeQueryParams::GetAttributes {
-            address: Addr::unchecked("tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync"),
-            name: String::from("id"),
-        };
-
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Attributes = from_binary(&bin).unwrap();
-
-        assert_eq!(
-            rep.address,
-            Addr::unchecked("tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync")
-        );
-        assert_eq!(rep.attributes.len(), 1);
-        assert_eq!(
-            rep.attributes[0].value,
-            Binary::from("88202946-4447-401c-b38c-75c46d8b5692".as_bytes())
-        )
-    }
-
-    #[test]
-    fn get_attributes_empty() {
-        let querier = AttributeQuerier::new(
-            "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync",
-            &[
-                ("id", "88202946-4447-401c-b38c-75c46d8b5692", "uuid"),
-                ("profile", "dd152f91-e39f-4c17-9ebf-6eb534ec61e5", "uuid"),
-            ],
-        );
-
-        let params = AttributeQueryParams::GetAttributes {
-            address: Addr::unchecked("tp1fhdhzrnpq9rnnyp8r6xvm75t0cmdul3xqyp6sd"),
-            name: String::from("uuid"),
-        };
-
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Attributes = from_binary(&bin).unwrap();
-
-        // Assert there are no records, but not an error
-        assert_eq!(rep.attributes.len(), 0);
-    }
-
-    #[test]
-    fn get_all_attributes() {
-        let querier = AttributeQuerier::new(
-            "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync",
-            &[
-                ("id", "88202946-4447-401c-b38c-75c46d8b5692", "uuid"),
-                ("profile", "dd152f91-e39f-4c17-9ebf-6eb534ec61e5", "uuid"),
-                ("kyc", "8cd6ec14-3f5e-4a08-98c5-0ea1585f9b76", "uuid"),
-            ],
-        );
-
-        let params = AttributeQueryParams::GetAllAttributes {
-            address: Addr::unchecked("tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync"),
-        };
-
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Attributes = from_binary(&bin).unwrap();
-
-        assert_eq!(
-            rep.address,
-            Addr::unchecked("tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync")
-        );
-        assert_eq!(rep.attributes.len(), 3);
-    }
-
-    #[test]
-    fn get_attributes_dup_keys() {
-        let querier = AttributeQuerier::new(
-            "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync",
-            &[
-                ("id", "88202946-4447-401c-b38c-75c46d8b5692", "uuid"),
-                ("id", "06c1494e-fdee-4396-b7e9-16688ff5966c", "uuid"),
-                ("profile", "dd152f91-e39f-4c17-9ebf-6eb534ec61e5", "uuid"),
-                ("kyc", "8cd6ec14-3f5e-4a08-98c5-0ea1585f9b76", "uuid"),
-            ],
-        );
-
-        let params = AttributeQueryParams::GetAttributes {
-            address: Addr::unchecked("tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync"),
-            name: String::from("id"),
-        };
-
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Attributes = from_binary(&bin).unwrap();
-
-        assert_eq!(
-            rep.address,
-            Addr::unchecked("tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync")
-        );
-        assert_eq!(rep.attributes.len(), 2);
-    }
-
-    #[test]
-    fn get_all_attributes_empty() {
-        let querier = AttributeQuerier::new(
-            "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync",
-            &[
-                ("id", "88202946-4447-401c-b38c-75c46d8b5692", "uuid"),
-                ("profile", "dd152f91-e39f-4c17-9ebf-6eb534ec61e5", "uuid"),
-                ("kyc", "8cd6ec14-3f5e-4a08-98c5-0ea1585f9b76", "uuid"),
-            ],
-        );
-
-        let params = AttributeQueryParams::GetAllAttributes {
-            address: Addr::unchecked("tp1fhdhzrnpq9rnnyp8r6xvm75t0cmdul3xqyp6sd"),
-        };
-
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Attributes = from_binary(&bin).unwrap();
-
-        // Assert there are no records, but not an error
-        assert_eq!(rep.attributes.len(), 0);
-    }
-}
diff --git a/packages/provwasm-mocks/src/common.rs b/packages/provwasm-mocks/src/common.rs
deleted file mode 100644
index eb8a8e98..00000000
--- a/packages/provwasm-mocks/src/common.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use cosmwasm_std::{Binary, ContractResult, QuerierResult, StdResult, SystemError, SystemResult};
-use std::fs::File;
-use std::io::Read;
-
-// Helper for returning mock query success cases.
-pub fn query_result(bin: StdResult<Binary>) -> QuerierResult {
-    SystemResult::Ok(ContractResult::Ok(bin.unwrap()))
-}
-
-// Helper for returning mock query error cases.
-pub fn query_error(error: &str, bin: StdResult<Binary>) -> QuerierResult {
-    SystemResult::Err(SystemError::InvalidRequest {
-        error: String::from(error),
-        request: bin.unwrap(),
-    })
-}
-
-/// A helper function for mock testing. This function allows tests to read a file in CosmWasm binary
-/// format. This function will panic on any error. Because of this, it should only be used in tests.
-pub fn must_read_binary_file(filename: &str) -> Binary {
-    match File::open(filename) {
-        Ok(mut file) => {
-            let mut content = String::new();
-            file.read_to_string(&mut content).unwrap();
-            Binary::from(content.as_bytes())
-        }
-        Err(error) => {
-            panic!("Error opening file {}: {}", filename, error);
-        }
-    }
-}
diff --git a/packages/provwasm-mocks/src/lib.rs b/packages/provwasm-mocks/src/lib.rs
index 8d90866b..ebcdf606 100644
--- a/packages/provwasm-mocks/src/lib.rs
+++ b/packages/provwasm-mocks/src/lib.rs
@@ -1,26 +1,6 @@
-#[allow(deprecated)]
-pub use attribute::AttributeQuerier;
-pub use common::must_read_binary_file;
-#[allow(deprecated)]
-pub use marker::MarkerQuerier;
-#[allow(deprecated)]
-pub use metadata::MetadataQuerier;
-#[allow(deprecated)]
-pub use name::NameQuerier;
-#[allow(deprecated)]
 pub use querier::{
-    mock_dependencies, mock_dependencies_with_balances, mock_provenance_dependencies,
-    mock_provenance_dependencies_with_custom_querier, MockProvenanceQuerier, ProvenanceMockQuerier,
+    mock_provenance_dependencies, mock_provenance_dependencies_with_custom_querier,
+    MockProvenanceQuerier,
 };
-
-#[allow(deprecated)]
-mod attribute;
-mod common;
-#[allow(deprecated)]
-mod marker;
-#[allow(deprecated)]
-mod metadata;
-#[allow(deprecated)]
-mod name;
 #[allow(deprecated)]
 mod querier;
diff --git a/packages/provwasm-mocks/src/marker.rs b/packages/provwasm-mocks/src/marker.rs
deleted file mode 100644
index dd43672e..00000000
--- a/packages/provwasm-mocks/src/marker.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use crate::common::{query_error, query_result};
-use cosmwasm_std::{to_binary, Addr, QuerierResult};
-use provwasm_std::{Marker, MarkerQueryParams};
-use std::collections::HashMap;
-
-/// A mock for testing provenance marker module queries.
-#[deprecated(since = "2.0.0")]
-#[derive(Clone, Default)]
-pub struct MarkerQuerier {
-    denom_records: HashMap<String, Marker>,
-    address_records: HashMap<Addr, Marker>,
-}
-
-impl MarkerQuerier {
-    pub fn new(inputs: Vec<Marker>) -> Self {
-        let mut denom_records = HashMap::new();
-        let mut address_records = HashMap::new();
-        for m in inputs.iter() {
-            denom_records.insert(m.denom.clone(), m.clone());
-            address_records.insert(m.address.clone(), m.clone());
-        }
-        MarkerQuerier {
-            denom_records,
-            address_records,
-        }
-    }
-
-    fn get_marker_by_denom(&self, denom: &str) -> Option<QuerierResult> {
-        self.denom_records
-            .get(denom)
-            .map(|marker| query_result(to_binary(&marker)))
-    }
-
-    fn get_marker_by_address(&self, address: &Addr) -> Option<QuerierResult> {
-        self.address_records
-            .get(address)
-            .map(|marker| query_result(to_binary(&marker)))
-    }
-
-    pub fn query(&self, params: &MarkerQueryParams) -> QuerierResult {
-        let maybe_marker = match params {
-            MarkerQueryParams::GetMarkerByAddress { address } => {
-                self.get_marker_by_address(address)
-            }
-            MarkerQueryParams::GetMarkerByDenom { denom } => self.get_marker_by_denom(denom),
-        };
-        match maybe_marker {
-            Some(r) => r,
-            None => query_error("marker not found", to_binary(params)),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::common::must_read_binary_file;
-    use cosmwasm_std::{from_binary, SystemError};
-    use provwasm_std::{MarkerQueryParams, MarkerStatus, MarkerType};
-
-    #[test]
-    fn get_marker_by_denom() {
-        let bin = must_read_binary_file("testdata/marker.json");
-        let expected_marker: Marker = from_binary(&bin).unwrap();
-        let querier = MarkerQuerier::new(vec![expected_marker.clone()]);
-
-        let params = MarkerQueryParams::GetMarkerByDenom {
-            denom: "nugz".into(),
-        };
-        let bin = querier.query(&params).unwrap().unwrap();
-        let marker: Marker = from_binary(&bin).unwrap();
-
-        assert_eq!(marker, expected_marker)
-    }
-
-    #[test]
-    fn get_manager() {
-        // Set up mocks
-        let bin = must_read_binary_file("testdata/marker.json");
-        let test_marker: Marker = from_binary(&bin).unwrap();
-        let querier = MarkerQuerier::new(vec![test_marker]);
-
-        // Query for marker
-        let res = querier
-            .query(&MarkerQueryParams::GetMarkerByDenom {
-                denom: "nugz".into(),
-            })
-            .unwrap();
-        let bin = res.unwrap();
-        let marker: Marker = from_binary(&bin).unwrap();
-
-        // Ensure the manager address is set on proposed marker.
-        assert_eq!(marker.status, MarkerStatus::Proposed);
-        assert_eq!(marker.manager, "tp15rrl3qjafxzlzguu5x29xh29pam35uetkpnnph")
-    }
-
-    #[test]
-    fn get_marker_by_address() {
-        let bin = must_read_binary_file("testdata/marker.json");
-        let expected_marker: Marker = from_binary(&bin).unwrap();
-        let querier = MarkerQuerier::new(vec![expected_marker.clone()]);
-
-        let params = MarkerQueryParams::GetMarkerByAddress {
-            address: Addr::unchecked("tp18vmzryrvwaeykmdtu6cfrz5sau3dhc5c73ms0u"),
-        };
-        let bin = querier.query(&params).unwrap().unwrap();
-        let marker: Marker = from_binary(&bin).unwrap();
-
-        assert_eq!(marker, expected_marker)
-    }
-
-    #[test]
-    fn get_marker_not_found() {
-        let querier = MarkerQuerier::default();
-        let params = MarkerQueryParams::GetMarkerByDenom {
-            denom: "budz".into(),
-        };
-        let err = querier.query(&params).unwrap_err();
-        match err {
-            SystemError::InvalidRequest { error, .. } => assert_eq!(error, "marker not found"),
-            _ => panic!("unexpected error type"),
-        }
-    }
-
-    #[test]
-    fn get_active_restricted_marker() {
-        // Assert that bank sends are disabled for restricted markers
-        let bin = must_read_binary_file("testdata/marker_restricted.json");
-        let marker: Marker = from_binary(&bin).unwrap();
-        assert_eq!(marker.marker_type, MarkerType::Restricted);
-        assert_eq!(marker.bank_sends_disabled(), true);
-        // Check manager is None for active markers
-        assert_eq!(marker.status, MarkerStatus::Active);
-        assert_eq!(marker.manager, "");
-    }
-}
diff --git a/packages/provwasm-mocks/src/metadata.rs b/packages/provwasm-mocks/src/metadata.rs
deleted file mode 100644
index 5902f7c4..00000000
--- a/packages/provwasm-mocks/src/metadata.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-use crate::common::{query_error, query_result};
-use cosmwasm_std::{to_binary, QuerierResult};
-use provwasm_std::{MetadataQueryParams, Records, Scope, Sessions};
-use std::collections::HashMap;
-
-/// A mock for testing provenance metadata module queries.
-#[deprecated(since = "2.0.0")]
-#[derive(Clone, Default)]
-pub struct MetadataQuerier {
-    scope_store: HashMap<String, Scope>,
-    sessions_store: HashMap<String, Sessions>,
-    records_store: HashMap<String, Records>,
-}
-
-impl MetadataQuerier {
-    /// Create a new mock metdata querier with some scope metadata set. It is assumed that if
-    /// sessions and records are passed, they are for the provided scope.
-    pub fn new(scope: Scope, sessions: Option<Sessions>, records: Option<Records>) -> Self {
-        // Store scope
-        let mut scope_store = HashMap::new();
-        scope_store.insert(scope.scope_id.to_string(), scope.clone());
-        // Store sessions
-        let mut sessions_store = HashMap::new();
-        sessions.into_iter().for_each(|s| {
-            sessions_store.insert(scope.scope_id.to_string(), s);
-        });
-        // Store records
-        let mut records_store = HashMap::new();
-        records.into_iter().for_each(|r| {
-            records_store.insert(scope.scope_id.to_string(), r);
-        });
-        // Create and return the mock metadata querier
-        MetadataQuerier {
-            scope_store,
-            sessions_store,
-            records_store,
-        }
-    }
-
-    fn get_scope(&self, scope_id: &str) -> Option<QuerierResult> {
-        self.scope_store
-            .get(&scope_id.to_string())
-            .map(|scope| query_result(to_binary(scope)))
-    }
-
-    fn get_sessions(&self, scope_id: &str) -> Option<QuerierResult> {
-        self.sessions_store
-            .get(&scope_id.to_string())
-            .map(|sessions| query_result(to_binary(sessions)))
-    }
-
-    fn get_records(&self, scope_id: &str, name: Option<String>) -> Option<QuerierResult> {
-        self.records_store
-            .get(&scope_id.to_string())
-            .map(|r| Records {
-                records: r
-                    .records
-                    .iter()
-                    .filter(|rec| name.is_none() || rec.name == name.clone().unwrap())
-                    .cloned()
-                    .collect(),
-            })
-            .map(|records| query_result(to_binary(&records)))
-    }
-
-    pub fn query(&self, params: &MetadataQueryParams) -> QuerierResult {
-        let maybe_result = match params {
-            MetadataQueryParams::GetScope { scope_id } => self.get_scope(scope_id),
-            MetadataQueryParams::GetSessions { scope_id } => self.get_sessions(scope_id),
-            MetadataQueryParams::GetRecords { scope_id, name } => {
-                self.get_records(scope_id, name.clone())
-            }
-        };
-        match maybe_result {
-            Some(r) => r,
-            None => query_error("metadata not found", to_binary(params)),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::common::must_read_binary_file;
-    use cosmwasm_std::{from_binary, Binary};
-
-    // The scope ID used for test queries.
-    const TEST_SCOPE_ID: &str = "scope1qqqqq2wf3c4yt4u447m8pw65qcdqrre82d";
-
-    // Read a test scope from file.
-    fn test_scope() -> Scope {
-        let bin = must_read_binary_file("testdata/scope.json");
-        from_binary(&bin).unwrap()
-    }
-    // Read test sessions from file.
-    fn test_sessions() -> Sessions {
-        let bin = must_read_binary_file("testdata/sessions.json");
-        from_binary(&bin).unwrap()
-    }
-
-    // Read test records from file.
-    fn test_records() -> Records {
-        let bin = must_read_binary_file("testdata/records.json");
-        from_binary(&bin).unwrap()
-    }
-
-    // Execute a query against the mock metadata querier.
-    fn mock_query(params: &MetadataQueryParams) -> Binary {
-        let querier =
-            MetadataQuerier::new(test_scope(), Some(test_sessions()), Some(test_records()));
-        querier.query(params).unwrap().unwrap()
-    }
-
-    #[test]
-    fn query_scope() {
-        let result = mock_query(&MetadataQueryParams::GetScope {
-            scope_id: TEST_SCOPE_ID.into(),
-        });
-        let scope: Scope = from_binary(&result).unwrap();
-        assert_eq!(scope, test_scope())
-    }
-
-    #[test]
-    fn query_sessions() {
-        let result = mock_query(&MetadataQueryParams::GetSessions {
-            scope_id: TEST_SCOPE_ID.into(),
-        });
-        let sessions: Sessions = from_binary(&result).unwrap();
-        assert_eq!(sessions, test_sessions())
-    }
-
-    #[test]
-    fn query_records() {
-        let result = mock_query(&MetadataQueryParams::GetRecords {
-            scope_id: TEST_SCOPE_ID.into(),
-            name: None,
-        });
-        let records: Records = from_binary(&result).unwrap();
-        assert_eq!(records, test_records())
-    }
-
-    #[test]
-    fn query_records_by_name() {
-        let bin = must_read_binary_file("testdata/loan_record.json");
-        let expected: Records = from_binary(&bin).unwrap();
-
-        let result = mock_query(&MetadataQueryParams::GetRecords {
-            scope_id: TEST_SCOPE_ID.into(),
-            name: Some("loan".into()),
-        });
-
-        let records: Records = from_binary(&result).unwrap();
-        assert_eq!(records, expected)
-    }
-}
diff --git a/packages/provwasm-mocks/src/name.rs b/packages/provwasm-mocks/src/name.rs
deleted file mode 100644
index 48a37a84..00000000
--- a/packages/provwasm-mocks/src/name.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use crate::common::{query_error, query_result};
-use cosmwasm_std::{to_binary, Addr, QuerierResult};
-use provwasm_std::{Name, NameQueryParams, Names};
-use std::collections::HashMap;
-
-/// A mock for testing provenance name module queries.
-#[deprecated(since = "2.0.0")]
-#[derive(Clone, Default)]
-pub struct NameQuerier {
-    records: HashMap<String, Name>,
-}
-
-impl NameQuerier {
-    pub fn new(inputs: &[(&str, &str, bool)]) -> Self {
-        let mut records = HashMap::new();
-        for (n, a, r) in inputs.iter() {
-            let name = (*n).to_string();
-            records.insert(
-                name.clone(),
-                Name {
-                    name,
-                    address: Addr::unchecked(*a),
-                    restricted: *r,
-                },
-            );
-        }
-        NameQuerier { records }
-    }
-
-    fn get_names(&self, name: &str) -> Option<Names> {
-        self.records.get(name).map(|record| Names {
-            records: vec![record.to_owned()],
-        })
-    }
-
-    fn lookup_names(&self, address: &Addr) -> Names {
-        Names {
-            records: self
-                .records
-                .values()
-                .cloned()
-                .filter(|r| !r.address.to_string().is_empty() && r.address == *address)
-                .collect(),
-        }
-    }
-
-    pub fn query(&self, params: &NameQueryParams) -> QuerierResult {
-        match params {
-            NameQueryParams::Resolve { name } => match self.get_names(name) {
-                Some(names) => query_result(to_binary(&names)),
-                None => query_error("no address bound to name", to_binary(params)),
-            },
-            NameQueryParams::Lookup { address } => {
-                let names = self.lookup_names(address);
-                query_result(to_binary(&names))
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use cosmwasm_std::{from_binary, SystemError};
-
-    #[test]
-    fn resolve() {
-        let querier = NameQuerier::new(&[
-            ("foo.pb", "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync", false),
-            ("bar.pb", "tp1238aw49q0nvz6nyj86mxgppn0wt60td5ngfhk9", false),
-        ]);
-
-        let params = NameQueryParams::Resolve {
-            name: String::from("foo.pb"),
-        };
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Names = from_binary(&bin).unwrap();
-
-        assert_eq!(rep.records.len(), 1);
-        assert_eq!(
-            rep.records[0].address,
-            Addr::unchecked("tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync")
-        )
-    }
-
-    #[test]
-    fn resolve_name_not_bound_err() {
-        let querier =
-            NameQuerier::new(&[("foo.pb", "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync", false)]);
-
-        let params = NameQueryParams::Resolve {
-            name: String::from("bar.pb"),
-        };
-        let err = querier.query(&params).unwrap_err();
-
-        match err {
-            SystemError::InvalidRequest { error, .. } => {
-                assert_eq!(error, "no address bound to name")
-            }
-            _ => panic!("unexpected error type"),
-        }
-    }
-
-    #[test]
-    fn lookup() {
-        let querier = NameQuerier::new(&[
-            ("foo.pb", "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync", false),
-            ("bar.pb", "tp1238aw49q0nvz6nyj86mxgppn0wt60td5ngfhk9", false),
-        ]);
-
-        let params = NameQueryParams::Lookup {
-            address: Addr::unchecked("tp1238aw49q0nvz6nyj86mxgppn0wt60td5ngfhk9"),
-        };
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Names = from_binary(&bin).unwrap();
-
-        assert_eq!(rep.records.len(), 1);
-        assert_eq!(rep.records[0].name, "bar.pb")
-    }
-
-    #[test]
-    fn lookup_empty() {
-        let querier = NameQuerier::new(&[
-            ("foo.pb", "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync", false),
-            ("bar.pb", "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync", false),
-            ("baz.pb", "tp1y0txdp3sqmxjvfdaa8hfvwcljl8ugcfv26uync", false),
-        ]);
-
-        let params = NameQueryParams::Lookup {
-            address: Addr::unchecked("tp1238aw49q0nvz6nyj86mxgppn0wt60td5ngfhk9"),
-        };
-        let bin = querier.query(&params).unwrap().unwrap();
-        let rep: Names = from_binary(&bin).unwrap();
-
-        // Assert there are no records, but not an error
-        assert_eq!(rep.records.len(), 0);
-    }
-}
diff --git a/packages/provwasm-mocks/src/querier.rs b/packages/provwasm-mocks/src/querier.rs
index 19fa2041..0322a25b 100644
--- a/packages/provwasm-mocks/src/querier.rs
+++ b/packages/provwasm-mocks/src/querier.rs
@@ -1,126 +1,14 @@
-use crate::{AttributeQuerier, MarkerQuerier, MetadataQuerier, NameQuerier};
-use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage, MOCK_CONTRACT_ADDR};
-use cosmwasm_std::{
-    from_slice, to_binary, Binary, Coin, Empty, OwnedDeps, Querier, QuerierResult, QueryRequest,
-    StdResult, SystemError, SystemResult,
-};
-use provwasm_common::MockableQuerier;
-use provwasm_std::{Marker, ProvenanceQuery, ProvenanceQueryParams, Records, Scope, Sessions};
-use serde::de::DeserializeOwned;
 use std::collections::HashMap;
 use std::marker::PhantomData;
 
-/// A drop-in replacement for cosmwasm_std::testing::mock_dependencies that uses the mock
-/// provenance querier.
-#[deprecated(since = "2.0.0")]
-pub fn mock_dependencies(
-    contract_balance: &[Coin],
-) -> OwnedDeps<MockStorage, MockApi, ProvenanceMockQuerier, ProvenanceQuery> {
-    let base = MockQuerier::new(&[(MOCK_CONTRACT_ADDR, contract_balance)]);
-    OwnedDeps {
-        storage: MockStorage::default(),
-        api: MockApi::default(),
-        querier: ProvenanceMockQuerier::new(base),
-        custom_query_type: PhantomData,
-    }
-}
-
-/// Initializes the mock querier with the account balances provided. NOTE: contract balance must
-/// be set in the balances slice passed if required.
-#[deprecated(since = "2.0.0")]
-pub fn mock_dependencies_with_balances(
-    balances: &[(&str, &[Coin])],
-) -> OwnedDeps<MockStorage, MockApi, ProvenanceMockQuerier, ProvenanceQuery> {
-    let base = MockQuerier::new(balances);
-    OwnedDeps {
-        storage: MockStorage::default(),
-        api: MockApi::default(),
-        querier: ProvenanceMockQuerier::new(base),
-        custom_query_type: PhantomData,
-    }
-}
-
-#[deprecated(since = "2.0.0")]
-pub struct ProvenanceMockQuerier {
-    pub base: MockQuerier,
-    name: NameQuerier,
-    attribute: AttributeQuerier,
-    marker: MarkerQuerier,
-    metadata: MetadataQuerier,
-}
-
-impl Querier for ProvenanceMockQuerier {
-    fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
-        let request: StdResult<QueryRequest<ProvenanceQuery>> = from_slice(bin_request);
-        match &request {
-            Ok(provenance_query) => self.handle_query(provenance_query),
-            _ => self.base.raw_query(bin_request),
-        }
-    }
-}
-
-impl ProvenanceMockQuerier {
-    pub fn handle_query(&self, request: &QueryRequest<ProvenanceQuery>) -> QuerierResult {
-        match request {
-            QueryRequest::Custom(custom) => match &custom.params {
-                ProvenanceQueryParams::Attribute(p) => self.attribute.query(p),
-                ProvenanceQueryParams::Marker(p) => self.marker.query(p),
-                ProvenanceQueryParams::Name(p) => self.name.query(p),
-                ProvenanceQueryParams::Metadata(p) => self.metadata.query(p),
-            },
-            QueryRequest::Bank(q) => self.base.handle_query(&QueryRequest::Bank(q.clone())),
-            #[cfg(feature = "staking")]
-            QueryRequest::Staking(q) => self.base.handle_query(&QueryRequest::Staking(q.clone())),
-            QueryRequest::Wasm(q) => self.base.handle_query(&QueryRequest::Wasm(q.clone())),
-            // Note: As of 0.14, no mocks exist for stargate or ibc queries in base, so we just
-            // return an error.
-            _ => SystemResult::Err(SystemError::InvalidRequest {
-                error: "invalid query request type".into(),
-                request: to_binary(&request).unwrap(),
-            }),
-        }
-    }
-}
-
-impl ProvenanceMockQuerier {
-    pub fn new(base: MockQuerier) -> Self {
-        ProvenanceMockQuerier {
-            base,
-            attribute: AttributeQuerier::default(),
-            name: NameQuerier::default(),
-            marker: MarkerQuerier::default(),
-            metadata: MetadataQuerier::default(),
-        }
-    }
-
-    pub fn with_names(&mut self, inputs: &[(&str, &str, bool)]) {
-        self.name = NameQuerier::new(inputs);
-    }
-
-    pub fn with_attributes(&mut self, address: &str, inputs: &[(&str, &str, &str)]) {
-        self.attribute = AttributeQuerier::new(address, inputs);
-    }
-
-    pub fn with_markers(&mut self, inputs: Vec<Marker>) {
-        self.marker = MarkerQuerier::new(inputs);
-    }
-
-    pub fn with_scope(&mut self, scope: Scope) {
-        self.metadata = MetadataQuerier::new(scope, None, None)
-    }
-
-    pub fn with_sessions(&mut self, scope: Scope, sessions: Sessions) {
-        self.metadata = MetadataQuerier::new(scope, Some(sessions), None)
-    }
-
-    pub fn with_records(&mut self, scope: Scope, records: Records) {
-        self.metadata = MetadataQuerier::new(scope, None, Some(records))
-    }
+use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage};
+use cosmwasm_std::{
+    from_json, Binary, Coin, Empty, OwnedDeps, Querier, QuerierResult, QueryRequest, SystemError,
+    SystemResult,
+};
+use serde::de::DeserializeOwned;
 
-    pub fn with_metadata(&mut self, scope: Scope, sessions: Sessions, records: Records) {
-        self.metadata = MetadataQuerier::new(scope, Some(sessions), Some(records))
-    }
-}
+use provwasm_common::MockableQuerier;
 
 pub struct MockProvenanceQuerier<C: DeserializeOwned = Empty> {
     /// Default CosmWASM mock querier.
@@ -166,7 +54,7 @@ impl MockableQuerier for MockProvenanceQuerier {
 
 impl Querier for MockProvenanceQuerier {
     fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
-        let request: QueryRequest<Empty> = match from_slice(bin_request) {
+        let request: QueryRequest<Empty> = match from_json(bin_request) {
             Ok(v) => v,
             Err(e) => {
                 return SystemResult::Err(SystemError::InvalidRequest {
@@ -207,28 +95,9 @@ pub fn mock_provenance_dependencies(
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use cosmwasm_std::{coin, from_binary, BalanceResponse, BankQuery};
 
-    #[test]
-    fn query_with_balances() {
-        let amount = coin(12345, "denom");
-        let deps = mock_dependencies_with_balances(&[("alice", &[amount.clone()])]);
-        let bin = deps
-            .querier
-            .handle_query(
-                &BankQuery::Balance {
-                    address: "alice".into(),
-                    denom: "denom".into(),
-                }
-                .into(),
-            )
-            .unwrap()
-            .unwrap();
-
-        let res: BalanceResponse = from_binary(&bin).unwrap();
-        assert_eq!(res.amount, amount);
-    }
+    use super::*;
 
     #[test]
     fn query_with_balances_2_0() {
diff --git a/packages/provwasm-std/src/lib.rs b/packages/provwasm-std/src/lib.rs
index 50283285..819741b4 100644
--- a/packages/provwasm-std/src/lib.rs
+++ b/packages/provwasm-std/src/lib.rs
@@ -2,42 +2,9 @@
 pub const PROVENANCE_VERSION: &str = include_str!("types/PROVENANCE_COMMIT");
 
 mod common;
-#[allow(deprecated)]
-mod msg;
-#[allow(deprecated)]
-mod querier;
-#[allow(deprecated)]
-mod query;
 mod serde;
 pub mod shim;
-#[allow(deprecated)]
 pub mod types;
-
-#[allow(deprecated)]
-pub use msg::{
-    activate_marker, add_attribute, add_json_attribute, assess_custom_fee, bind_name,
-    burn_marker_supply, cancel_marker, create_forced_transfer_marker, create_marker,
-    delete_attributes, delete_distinct_attribute, destroy_marker, finalize_marker,
-    grant_marker_access, mint_marker_supply, revoke_marker_access, transfer_marker_coins,
-    unbind_name, update_attribute, withdraw_coins, write_scope, AttributeMsgParams,
-    MarkerMsgParams, MetadataMsgParams, MsgFeesMsgParams, NameMsgParams, ProvenanceMsg,
-    ProvenanceMsgParams,
-};
-#[allow(deprecated)]
-pub use querier::ProvenanceQuerier;
-#[allow(deprecated)]
-pub use query::{
-    AttributeQueryParams, MarkerQueryParams, MetadataQueryParams, NameQueryParams, ProvenanceQuery,
-    ProvenanceQueryParams,
-};
-#[allow(deprecated)]
-pub use types::{
-    AccessGrant, Attribute, AttributeValueType, Attributes, Marker, MarkerAccess, MarkerStatus,
-    MarkerType, Name, NameBinding, Names, Party, PartyType, Process, ProcessId, ProvenanceRoute,
-    Record, RecordInput, RecordInputSource, RecordInputStatus, RecordOutput, Records, ResultStatus,
-    Scope, Session, Sessions,
-};
-
 // Indicate that smart contracts that use this lib can only be run on the Provenance Blockchain.
 #[no_mangle]
 extern "C" fn requires_provenance() {}
diff --git a/packages/provwasm-std/src/msg.rs b/packages/provwasm-std/src/msg.rs
deleted file mode 100644
index 9637e836..00000000
--- a/packages/provwasm-std/src/msg.rs
+++ /dev/null
@@ -1,901 +0,0 @@
-use cosmwasm_std::{
-    coin, to_binary, Addr, Binary, Coin, CosmosMsg, CustomMsg, StdError, StdResult,
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::common::{validate_address, validate_string};
-use crate::types::{
-    AttributeValueType, MarkerAccess, MarkerType, NameBinding, ProvenanceRoute, Scope,
-};
-
-// The data format version to pass into provenance for message encoding
-static MSG_DATAFMT_VERSION: &str = "2.0.0";
-
-/// Represents a request to encode custom provenance messages.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct ProvenanceMsg {
-    pub route: ProvenanceRoute,      // The module router key
-    pub params: ProvenanceMsgParams, // The module-specific encoder params
-    pub version: String,             // The data format version
-}
-
-impl CustomMsg for ProvenanceMsg {}
-
-// Implements From for ProvenanceMsg so it can be used in place of CosmosMsg<ProvenanceMsg>
-impl From<ProvenanceMsg> for CosmosMsg<ProvenanceMsg> {
-    fn from(msg: ProvenanceMsg) -> Self {
-        CosmosMsg::Custom(msg)
-    }
-}
-
-/// Input params for custom provenance message encoders.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-pub enum ProvenanceMsgParams {
-    Name(NameMsgParams),
-    Attribute(AttributeMsgParams),
-    Marker(MarkerMsgParams),
-    Metadata(MetadataMsgParams),
-    MsgFees(MsgFeesMsgParams),
-}
-
-/// Input params for creating name module messages.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum NameMsgParams {
-    BindName {
-        name: String,
-        address: Addr,
-        restrict: bool,
-    },
-    DeleteName {
-        name: String,
-    },
-}
-
-// Create a custom cosmos message using name module params.
-#[deprecated(since = "2.0.0")]
-fn create_name_msg(params: NameMsgParams) -> CosmosMsg<ProvenanceMsg> {
-    CosmosMsg::Custom(ProvenanceMsg {
-        route: ProvenanceRoute::Name,
-        params: ProvenanceMsgParams::Name(params),
-        version: String::from(MSG_DATAFMT_VERSION),
-    })
-}
-
-/// Create a message that will bind a name to an address.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdResult};
-/// use provwasm_std::{bind_name, NameBinding, ProvenanceMsg};
-///
-/// // Bind a name to an address.
-/// fn exec_bind_name(
-///     name: String,
-///     address: Addr,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///    let msg = bind_name(&name, address, NameBinding::Restricted)?;
-///    let mut res = Response::new().add_message(msg);
-///    Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn bind_name<S: Into<String>, H: Into<Addr>>(
-    name: S,
-    address: H,
-    binding: NameBinding,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_name_msg(NameMsgParams::BindName {
-        name: validate_string(name, "name")?,
-        address: validate_address(address)?,
-        restrict: matches!(binding, NameBinding::Restricted),
-    }))
-}
-
-/// Create a message that will un-bind a name from an address.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{unbind_name, ProvenanceMsg};
-///
-/// // Unbind a name
-/// fn exec_unbind_name(name: String) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = unbind_name(&name)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn unbind_name<S: Into<String>>(name: S) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_name_msg(NameMsgParams::DeleteName {
-        name: validate_string(name, "name")?,
-    }))
-}
-
-/// Input params for creating attribute module messages.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum AttributeMsgParams {
-    AddAttribute {
-        address: Addr,
-        name: String,
-        value: Binary,
-        value_type: AttributeValueType,
-    },
-    DeleteAttribute {
-        address: Addr,
-        name: String,
-    },
-    DeleteDistinctAttribute {
-        address: Addr,
-        name: String,
-        value: Binary,
-    },
-    UpdateAttribute {
-        address: Addr,
-        name: String,
-        original_value: Binary,
-        original_value_type: AttributeValueType,
-        update_value: Binary,
-        update_value_type: AttributeValueType,
-    },
-}
-
-// Create a custom cosmos message using attribute module params.
-#[deprecated(since = "2.0.0")]
-fn create_attribute_msg(params: AttributeMsgParams) -> CosmosMsg<ProvenanceMsg> {
-    CosmosMsg::Custom(ProvenanceMsg {
-        route: ProvenanceRoute::Attribute,
-        params: ProvenanceMsgParams::Attribute(params),
-        version: String::from(MSG_DATAFMT_VERSION),
-    })
-}
-
-/// Create a message that will add an attribute (a typed key-value pair) to an account.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Binary, Env, Addr, Response, StdResult};
-/// use provwasm_std::{add_attribute, AttributeValueType, ProvenanceMsg};
-///
-/// // Add a greeting attribute to an account.
-/// // NOTE: The name below must resolve to the contract address.
-/// fn exec_add_greeting(
-///     env: Env,
-///     address: Addr,
-///     text: String,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let attr_name = String::from("greeting.my-contract.sc.pb");
-///     let greeting = String::from("hello");
-///     let msg = add_attribute(
-///         address,
-///         &attr_name,
-///         Binary::from(greeting.as_bytes()),
-///         AttributeValueType::String,
-///     )?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn add_attribute<H: Into<Addr>, S: Into<String>, B: Into<Binary>>(
-    address: H,
-    name: S,
-    value: B,
-    value_type: AttributeValueType,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    if value_type == AttributeValueType::Unspecified {
-        return Err(StdError::generic_err(
-            "cannot add attribute with unspecified value type",
-        ));
-    }
-    Ok(create_attribute_msg(AttributeMsgParams::AddAttribute {
-        address: validate_address(address)?,
-        name: validate_string(name, "name")?,
-        value: value.into(),
-        value_type,
-    }))
-}
-
-/// Create a message that will add a JSON attribute to an account. Serializable types can be passed
-/// into this function, but it's up to the user to handle StdResult error case.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Env, Addr, Response, StdResult};
-/// use provwasm_std::{add_json_attribute, ProvenanceMsg};
-/// use schemars::JsonSchema;
-/// use serde::{Deserialize, Serialize};
-///
-/// // Add a label attribute. NOTE: The name below must resolve to the contract address.
-/// fn exec_add_label(
-///     env: Env,
-///     address: Addr,
-///     text: String,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let attr_name = String::from("label.my-contract.sc.pb");
-///     let timestamp = env.block.time.nanos();
-///     let label = Label { text, timestamp };
-///     let msg = add_json_attribute(address, &attr_name, &label)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-///
-/// // Text with a timestamp.
-/// #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-/// #[serde(rename_all = "snake_case")]
-/// pub struct Label {
-///     pub text: String,
-///     pub timestamp: u64,
-/// }
-///
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn add_json_attribute<H: Into<Addr>, S: Into<String>, T: Serialize + ?Sized>(
-    address: H,
-    name: S,
-    data: &T,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    // Serialize the value, bailing on error
-    let value = to_binary(data)?;
-    // Create and return json typed message
-    add_attribute(address, name, value, AttributeValueType::Json)
-}
-
-/// Create a message that will remove all attributes with the given name from an account.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdResult};
-/// use provwasm_std::{delete_attributes, ProvenanceMsg};
-///
-/// // Delete all label attributes. NOTE: The name below must resolve to the contract address.
-/// fn exec_delete_labels(
-///     address: Addr,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let attr_name = String::from("label.my-contract.sc.pb");
-///     let msg = delete_attributes(address, &attr_name)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn delete_attributes<H: Into<Addr>, S: Into<String>>(
-    address: H,
-    name: S,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_attribute_msg(AttributeMsgParams::DeleteAttribute {
-        address: validate_address(address)?,
-        name: validate_string(name, "name")?,
-    }))
-}
-
-/// Create a message that will delete a distinct attribute with the given name and value from an account.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdResult, to_binary};
-/// use provwasm_std::{delete_distinct_attribute, ProvenanceMsg};
-///
-/// // Delete the distinct label attribute. NOTE: The name below must resolve to the contract address.
-/// fn try_delete_distinct_label(
-///     address: Addr,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let attr_name = String::from("label.my-contract.sc.pb");
-///     let attr_value = String::from("hello");
-///     let msg = delete_distinct_attribute(address, &attr_name, to_binary(&attr_value)?)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn delete_distinct_attribute<H: Into<Addr>, S: Into<String>, B: Into<Binary>>(
-    address: H,
-    name: S,
-    value: B,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_attribute_msg(
-        AttributeMsgParams::DeleteDistinctAttribute {
-            address: validate_address(address)?,
-            name: validate_string(name, "name")?,
-            value: value.into(),
-        },
-    ))
-}
-
-/// Create a message that will update an attribute (a typed key-value pair) on an account.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Binary, Env, Addr, Response, StdResult};
-/// use provwasm_std::{update_attribute, AttributeValueType, ProvenanceMsg};
-///
-/// // Update an attribute on an account.
-/// // NOTE: The name below must resolve to the contract address.
-/// fn try_update_attribute(
-///     env: Env,
-///     address: Addr,
-///     text: String,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let attr_name = String::from("attribute.my-contract.sc.pb");
-///     let original_attribute_value = String::from("hello");
-///     let updated_attribute_value = String::from("goodbye");
-///     let msg = update_attribute(
-///         address,
-///         &attr_name,
-///         Binary::from(original_attribute_value.as_bytes()),
-///         AttributeValueType::String,
-///         Binary::from(original_attribute_value.as_bytes()),
-///         AttributeValueType::String,
-///     )?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn update_attribute<H: Into<Addr>, S: Into<String>, B: Into<Binary>>(
-    address: H,
-    name: S,
-    original_value: B,
-    original_value_type: AttributeValueType,
-    update_value: B,
-    update_value_type: AttributeValueType,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    if original_value_type == AttributeValueType::Unspecified {
-        return Err(StdError::generic_err(
-            "cannot update attribute with unspecified original value type",
-        ));
-    }
-    if update_value_type == AttributeValueType::Unspecified {
-        return Err(StdError::generic_err(
-            "cannot update attribute with unspecified update value type",
-        ));
-    }
-    Ok(create_attribute_msg(AttributeMsgParams::UpdateAttribute {
-        address: validate_address(address)?,
-        name: validate_string(name, "name")?,
-        original_value: original_value.into(),
-        original_value_type,
-        update_value: update_value.into(),
-        update_value_type,
-    }))
-}
-
-/// Input params for creating marker module messages.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MarkerMsgParams {
-    CreateMarker {
-        coin: Coin,
-        marker_type: MarkerType,
-        allow_forced_transfer: bool,
-    },
-    GrantMarkerAccess {
-        denom: String,
-        address: Addr,
-        permissions: Vec<MarkerAccess>,
-    },
-    RevokeMarkerAccess {
-        denom: String,
-        address: Addr,
-    },
-    FinalizeMarker {
-        denom: String,
-    },
-    ActivateMarker {
-        denom: String,
-    },
-    CancelMarker {
-        denom: String,
-    },
-    DestroyMarker {
-        denom: String,
-    },
-    MintMarkerSupply {
-        coin: Coin,
-    },
-    BurnMarkerSupply {
-        coin: Coin,
-    },
-    WithdrawCoins {
-        marker_denom: String,
-        coin: Coin,
-        recipient: Addr,
-    },
-    TransferMarkerCoins {
-        coin: Coin,
-        to: Addr,
-        from: Addr,
-    },
-}
-
-// Create a custom cosmos message using marker module params.
-#[deprecated(since = "2.0.0")]
-fn create_marker_msg(params: MarkerMsgParams) -> CosmosMsg<ProvenanceMsg> {
-    CosmosMsg::Custom(ProvenanceMsg {
-        route: ProvenanceRoute::Marker,
-        params: ProvenanceMsgParams::Marker(params),
-        version: String::from(MSG_DATAFMT_VERSION),
-    })
-}
-
-/// Create a message that will propose a new marker with a given type.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{create_marker, MarkerType, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will propose a new unrestricted marker.
-/// fn try_create_marker(
-///     amount: u128,
-///     denom: String,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = create_marker(amount, &denom, MarkerType::Coin)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn create_marker<S: Into<String>>(
-    amount: u128,
-    denom: S,
-    marker_type: MarkerType,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    let coin = coin(amount, validate_string(denom, "denom")?);
-    Ok(create_marker_msg(MarkerMsgParams::CreateMarker {
-        coin,
-        marker_type,
-        allow_forced_transfer: false,
-    }))
-}
-
-/// Create a message that will propose a new restricted marker that allows forced transfers.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{create_forced_transfer_marker, MarkerType, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will propose a new restricted marker that allows forced transfers.
-/// fn try_create_forced_transfer_marker(
-///     amount: u128,
-///     denom: String,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = create_forced_transfer_marker(amount, &denom)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn create_forced_transfer_marker<S: Into<String>>(
-    amount: u128,
-    denom: S,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    let coin = coin(amount, validate_string(denom, "denom")?);
-    Ok(create_marker_msg(MarkerMsgParams::CreateMarker {
-        coin,
-        marker_type: MarkerType::Restricted,
-        allow_forced_transfer: true,
-    }))
-}
-
-/// Create a message that will grant permissions on a marker.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdResult};
-/// use provwasm_std::{grant_marker_access, MarkerAccess, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will grant specific permissions to a marker for an address.
-/// fn try_grant_marker_access(
-///     denom: String,
-///     address: Addr,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let permissions = vec![MarkerAccess::Burn, MarkerAccess::Mint];
-///     let msg = grant_marker_access(&denom, address, permissions)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn grant_marker_access<S: Into<String>, H: Into<Addr>>(
-    denom: S,
-    address: H,
-    permissions: Vec<MarkerAccess>,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_marker_msg(MarkerMsgParams::GrantMarkerAccess {
-        denom: validate_string(denom, "denom")?,
-        address: validate_address(address)?,
-        permissions,
-    }))
-}
-
-/// Create a message that will revoke marker permissions.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdResult};
-/// use provwasm_std::{revoke_marker_access, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will revoke all permissions from a marker for an address.
-/// fn try_revoke_marker_access(
-///     denom: String,
-///     address: Addr,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = revoke_marker_access(&denom, address)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn revoke_marker_access<S: Into<String>, H: Into<Addr>>(
-    denom: S,
-    address: H,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_marker_msg(MarkerMsgParams::RevokeMarkerAccess {
-        denom: validate_string(denom, "denom")?,
-        address: validate_address(address)?,
-    }))
-}
-
-/// Create a message that will finalize a proposed marker.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{finalize_marker, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will finalize a proposed marker.
-/// fn try_finalize_marker(denom: String) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = finalize_marker(&denom)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn finalize_marker<S: Into<String>>(denom: S) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_marker_msg(MarkerMsgParams::FinalizeMarker {
-        denom: validate_string(denom, "denom")?,
-    }))
-}
-
-/// Create a message that will activate a finalized marker.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{activate_marker, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will activate a finalized marker.
-/// fn try_activate_marker(denom: String) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = activate_marker(&denom)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn activate_marker<S: Into<String>>(denom: S) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_marker_msg(MarkerMsgParams::ActivateMarker {
-        denom: validate_string(denom, "denom")?,
-    }))
-}
-
-/// Create a message that will cancel a marker.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{cancel_marker, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will cancel a marker.
-/// fn try_cancel_marker(denom: String) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = cancel_marker(&denom)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn cancel_marker<S: Into<String>>(denom: S) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_marker_msg(MarkerMsgParams::CancelMarker {
-        denom: validate_string(denom, "denom")?,
-    }))
-}
-
-/// Create a message that will destroy a marker.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{destroy_marker, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will destroy a marker.
-/// fn try_destroy_marker(denom: String) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = destroy_marker(&denom)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn destroy_marker<S: Into<String>>(denom: S) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    Ok(create_marker_msg(MarkerMsgParams::DestroyMarker {
-        denom: validate_string(denom, "denom")?,
-    }))
-}
-
-/// Create a message that will mint marker coins.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{mint_marker_supply, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will mint marker supply.
-/// fn try_mint_marker(amount: u128, denom: String) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = mint_marker_supply(amount, &denom)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn mint_marker_supply<S: Into<String>>(
-    amount: u128,
-    denom: S,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    if amount == 0 {
-        return Err(StdError::generic_err("mint amount must be > 0"));
-    }
-    let coin = coin(amount, validate_string(denom, "denom")?);
-    Ok(create_marker_msg(MarkerMsgParams::MintMarkerSupply {
-        coin,
-    }))
-}
-
-/// Create a message that will burn marker coins.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Response, StdResult};
-/// use provwasm_std::{burn_marker_supply, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will burn marker supply.
-/// fn try_burn_marker(amount: u128, denom: String) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = burn_marker_supply(amount, &denom)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn burn_marker_supply<S: Into<String>>(
-    amount: u128,
-    denom: S,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    if amount == 0 {
-        return Err(StdError::generic_err("burn amount must be > 0"));
-    }
-    let coin = coin(amount, validate_string(denom, "denom")?);
-    Ok(create_marker_msg(MarkerMsgParams::BurnMarkerSupply {
-        coin,
-    }))
-}
-
-/// Create a message that will withdraw coins from a marker account to a recipient account.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdResult};
-/// use provwasm_std::{withdraw_coins, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will withdraw coins from a marker.
-/// fn try_withdraw_coins(
-///     marker_denom: String,
-///     amount: u128,
-///     denom: String,
-///     recipient: Addr,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = withdraw_coins(&marker_denom, amount, &denom, recipient)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn withdraw_coins<S: Into<String>, H: Into<Addr>>(
-    marker_denom: S,
-    amount: u128,
-    denom: S,
-    recipient: H,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    if amount == 0 {
-        return Err(StdError::generic_err("withdraw amount must be > 0"));
-    }
-    let coin = coin(amount, validate_string(denom, "denom")?);
-    Ok(create_marker_msg(MarkerMsgParams::WithdrawCoins {
-        marker_denom: validate_string(marker_denom, "marker_denom")?,
-        coin,
-        recipient: validate_address(recipient)?,
-    }))
-}
-
-/// Create a message that will transfer a marker amount from one account to another.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdResult};
-/// use provwasm_std::{transfer_marker_coins, ProvenanceMsg};
-///
-/// // Create and dispatch a message that will transfer marker coins from one account to another.
-/// // NOTE: Transfer is only enabled for restricted markers.
-/// fn try_transfer_marker_coins(
-///     amount: u128,
-///     denom: String,
-///     to: Addr,
-///     from: Addr,
-/// ) -> StdResult<Response<ProvenanceMsg>> {
-///     let msg = transfer_marker_coins(amount, &denom, to, from)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn transfer_marker_coins<S: Into<String>, H: Into<Addr>>(
-    amount: u128,
-    denom: S,
-    to: H,
-    from: H,
-) -> StdResult<CosmosMsg<ProvenanceMsg>> {
-    if amount == 0 {
-        return Err(StdError::generic_err("transfer amount must be > 0"));
-    }
-    let coin = coin(amount, validate_string(denom, "denom")?);
-    let msg = create_marker_msg(MarkerMsgParams::TransferMarkerCoins {
-        coin,
-        to: validate_address(to)?,
-        from: validate_address(from)?,
-    });
-    Ok(msg)
-}
-
-/// Input params for creating marker module messages.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MetadataMsgParams {
-    WriteScope { scope: Scope, signers: Vec<Addr> },
-}
-
-// Create a custom cosmos message using metadata module params.
-#[deprecated(since = "2.0.0")]
-fn create_metadata_msg(params: MetadataMsgParams) -> CosmosMsg<ProvenanceMsg> {
-    CosmosMsg::Custom(ProvenanceMsg {
-        route: ProvenanceRoute::Metadata,
-        params: ProvenanceMsgParams::Metadata(params),
-        version: String::from(MSG_DATAFMT_VERSION),
-    })
-}
-
-/// Create a message that will create, or update, a scope.
-///
-/// ### Example
-///
-/// ```rust
-/// // Imports required
-/// use cosmwasm_std::{Addr, Response, StdError};
-/// use provwasm_std::{ProvenanceMsg, Scope, write_scope};
-///
-/// // Create and dispatch a message that will create, or update, a scope.
-/// fn try_write_scope(scope: Scope, signers: Vec<Addr>) -> Result<Response<ProvenanceMsg>, StdError> {
-///     let msg = write_scope(scope, signers)?;
-///     let mut res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn write_scope<S: Into<Scope>, H: Into<Addr>>(
-    scope: S,
-    signers: Vec<H>,
-) -> Result<CosmosMsg<ProvenanceMsg>, StdError> {
-    Ok(create_metadata_msg(MetadataMsgParams::WriteScope {
-        scope: scope.into(),
-        signers: signers
-            .into_iter()
-            .map(validate_address)
-            .collect::<Result<Vec<Addr>, _>>()?,
-    }))
-}
-
-/// Input params for creating msgfee module messages.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MsgFeesMsgParams {
-    AssessCustomFee {
-        amount: Coin,
-        from: Addr,
-        name: Option<String>,
-        recipient: Option<Addr>,
-    },
-}
-
-// Create a custom cosmos message using msgfees module params.
-#[deprecated(since = "2.0.0")]
-fn create_msgfees_msg(params: MsgFeesMsgParams) -> CosmosMsg<ProvenanceMsg> {
-    CosmosMsg::Custom(ProvenanceMsg {
-        route: ProvenanceRoute::Msgfees,
-        params: ProvenanceMsgParams::MsgFees(params),
-        version: String::from(MSG_DATAFMT_VERSION),
-    })
-}
-
-/// Create a message that will assess a custom fee
-/// ### Example
-///
-/// ```rust
-/// use cosmwasm_std::{Addr, Coin, Response, StdError};
-/// use provwasm_std::{assess_custom_fee, MsgFeesMsgParams, ProvenanceMsg};
-///
-/// fn try_assess_custom_fee(amount: Coin, name: Option<String>, from: Addr, recipient: Option<Addr>) -> Result<Response<ProvenanceMsg>, StdError>{
-///     let msg = assess_custom_fee(amount, name, from, recipient)?;
-///     let res = Response::new().add_message(msg);
-///     Ok(res)
-/// }
-/// ```
-#[deprecated(since = "2.0.0")]
-pub fn assess_custom_fee<S: Into<String>>(
-    amount: Coin,
-    name: Option<S>,
-    from: Addr,
-    recipient: Option<Addr>,
-) -> Result<CosmosMsg<ProvenanceMsg>, StdError> {
-    Ok(create_msgfees_msg(MsgFeesMsgParams::AssessCustomFee {
-        amount,
-        name: name.map(|name| name.into()),
-        from,
-        recipient,
-    }))
-}
diff --git a/packages/provwasm-std/src/querier.rs b/packages/provwasm-std/src/querier.rs
deleted file mode 100644
index b0950f7d..00000000
--- a/packages/provwasm-std/src/querier.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-use cosmwasm_std::{from_binary, Addr, QuerierWrapper, StdError, StdResult};
-use serde::de::DeserializeOwned;
-
-use crate::common::{validate_address, validate_string};
-use crate::query::{
-    AttributeQueryParams, MarkerQueryParams, MetadataQueryParams, NameQueryParams, ProvenanceQuery,
-    ProvenanceQueryParams,
-};
-use crate::types::{
-    AttributeValueType, Attributes, Marker, Name, Names, ProvenanceRoute, Record, Records, Scope,
-    Sessions,
-};
-
-// The data format version to pass into provenance for queries.
-static QUERY_DATAFMT_VERSION: &str = "2.0.0";
-
-/// A type for simplifying provenance custom queries.
-#[deprecated(since = "2.0.0")]
-pub struct ProvenanceQuerier<'a> {
-    querier: &'a QuerierWrapper<'a, ProvenanceQuery>,
-}
-
-impl<'a> ProvenanceQuerier<'a> {
-    /// Creates a new provenance querier
-    pub fn new(querier: &'a QuerierWrapper<'a, ProvenanceQuery>) -> Self {
-        ProvenanceQuerier { querier }
-    }
-
-    // Execute a name module query.
-    fn query_name_module(&self, params: NameQueryParams) -> StdResult<Names> {
-        let request = ProvenanceQuery {
-            route: ProvenanceRoute::Name,
-            params: ProvenanceQueryParams::Name(params),
-            version: String::from(QUERY_DATAFMT_VERSION),
-        };
-        let res: Names = self.querier.query(&request.into())?;
-        Ok(res)
-    }
-
-    /// Resolve the address for a name.
-    ///
-    /// ### Example
-    ///
-    /// ```rust
-    /// // Imports required
-    /// use cosmwasm_std::{Deps, QueryResponse, StdResult};
-    /// use provwasm_std::{Name, ProvenanceQuerier, ProvenanceQuery};
-    ///
-    /// // Resolve the address for a name.
-    /// fn query_resolve_name(deps: Deps<ProvenanceQuery>, name: String) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let name: Name = querier.resolve_name(&name)?;
-    ///     // Do something with name.address ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn resolve_name<S: Into<String>>(&self, name: S) -> StdResult<Name> {
-        let res = self.query_name_module(NameQueryParams::Resolve {
-            name: validate_string(name, "name")?,
-        })?;
-        if res.records.len() != 1 {
-            return Err(StdError::generic_err(
-                "expected only one address bound to name",
-            ));
-        }
-        Ok(res.records[0].clone())
-    }
-
-    /// Lookup all names bound to the given address.
-    ///
-    /// ### Example
-    ///
-    /// ```rust
-    /// // Imports required
-    /// use cosmwasm_std::{Addr, Deps, QueryResponse, StdResult};
-    /// use provwasm_std::{Names, ProvenanceQuerier, ProvenanceQuery};
-    ///
-    /// // Lookup all names bound to an address.
-    /// fn query_lookup_names(deps: Deps<ProvenanceQuery>, address: Addr) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let names: Names = querier.lookup_names(address)?;
-    ///     // Do something with names.records ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn lookup_names<H: Into<Addr>>(&self, address: H) -> StdResult<Names> {
-        self.query_name_module(NameQueryParams::Lookup {
-            address: validate_address(address)?,
-        })
-    }
-
-    // Execute a attribute module query.
-    fn query_attributes(&self, params: AttributeQueryParams) -> StdResult<Attributes> {
-        let request = ProvenanceQuery {
-            route: ProvenanceRoute::Attribute,
-            params: ProvenanceQueryParams::Attribute(params),
-            version: String::from(QUERY_DATAFMT_VERSION),
-        };
-        let res: Attributes = self.querier.query(&request.into())?;
-        Ok(res)
-    }
-
-    /// Get attributes for an account. If the name parameter is `None`, all attributes are returned.
-    ///
-    ///  ### Example
-    ///
-    /// ```rust
-    /// // Imports required
-    /// use cosmwasm_std::{Addr, Deps, QueryResponse, StdResult};
-    /// use provwasm_std::{Attributes, ProvenanceQuerier, ProvenanceQuery};
-    ///
-    /// // Query all attributes added to an account.
-    /// pub fn try_query_attributes(deps: Deps<ProvenanceQuery>, address: Addr) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let none: Option<String> = None;
-    ///     let res: Attributes = querier.get_attributes(address, none)?;
-    ///     // Do something with res.attributes ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn get_attributes<H: Into<Addr>, S: Into<String>>(
-        &self,
-        address: H,
-        name: Option<S>,
-    ) -> StdResult<Attributes> {
-        let address = validate_address(address)?;
-        match name {
-            None => self.query_attributes(AttributeQueryParams::GetAllAttributes { address }),
-            Some(name) => self.query_attributes(AttributeQueryParams::GetAttributes {
-                address,
-                name: validate_string(name, "name")?,
-            }),
-        }
-    }
-
-    /// Get named JSON attributes from an account and deserialize the values.
-    /// Attribute values with the same name must be able to be deserialized to the same type.
-    ///
-    /// ### Example
-    ///
-    /// ```rust
-    /// // Imports required
-    /// use cosmwasm_std::{Addr, Deps, QueryResponse, StdResult};
-    /// use provwasm_std::{ProvenanceQuerier, ProvenanceQuery};
-    /// use schemars::JsonSchema;
-    /// use serde::{Deserialize, Serialize};
-    ///
-    /// // Query all label attributes added to an account.
-    /// pub fn query_labels(deps: Deps<ProvenanceQuery>, address: Addr) -> StdResult<QueryResponse> {
-    ///     let attr_name = String::from("label.my-contract.sc.pb");
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let labels: Vec<Label> = querier.get_json_attributes(address, &attr_name)?;
-    ///     // Do something with labels...
-    ///     todo!()
-    /// }
-    ///
-    /// // Text with timestamp.
-    /// #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-    /// #[serde(rename_all = "snake_case")]
-    /// pub struct Label {
-    ///     pub text: String,
-    ///     pub timestamp: u64,
-    /// }
-    /// ```
-    pub fn get_json_attributes<H: Into<Addr>, S: Into<String>, T: DeserializeOwned>(
-        &self,
-        address: H,
-        name: S,
-    ) -> StdResult<Vec<T>> {
-        // Gather results
-        let resp = self.query_attributes(AttributeQueryParams::GetAttributes {
-            address: validate_address(address)?,
-            name: validate_string(name, "name")?,
-        })?;
-        // Map deserialize, returning values or failure.
-        resp.attributes
-            .iter()
-            .filter(|a| a.value_type == AttributeValueType::Json)
-            .map(|a| from_binary(&a.value))
-            .collect()
-    }
-
-    // Execute a marker module query.
-    fn query_marker(&self, params: MarkerQueryParams) -> StdResult<Marker> {
-        let request = ProvenanceQuery {
-            route: ProvenanceRoute::Marker,
-            params: ProvenanceQueryParams::Marker(params),
-            version: String::from(QUERY_DATAFMT_VERSION),
-        };
-        let res: Marker = self.querier.query(&request.into())?;
-        Ok(res)
-    }
-
-    /// Get a marker by address.
-    ///
-    /// ### Example
-    ///
-    /// ```rust
-    /// // Imports required
-    /// use provwasm_std::{ProvenanceQuerier, Marker, ProvenanceQuery};
-    /// use cosmwasm_std::{Addr, Deps, QueryResponse, StdResult};
-    ///
-    /// // Query a marker by address.
-    /// fn try_get_marker_by_address(deps: Deps<ProvenanceQuery>, address: Addr) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let marker: Marker = querier.get_marker_by_address(address)?;
-    ///     // Do something with marker ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn get_marker_by_address<H: Into<Addr>>(&self, address: H) -> StdResult<Marker> {
-        self.query_marker(MarkerQueryParams::GetMarkerByAddress {
-            address: validate_address(address)?,
-        })
-    }
-
-    /// Get a marker by denomination.
-    ///
-    /// ### Example
-    ///
-    /// ```rust
-    /// // Imports required
-    /// use cosmwasm_std::{Deps, QueryResponse, StdResult};
-    /// use provwasm_std::{ProvenanceQuerier, Marker, ProvenanceQuery};
-    ///
-    /// // Query a marker by denom.
-    /// fn try_get_marker_by_denom(deps: Deps<ProvenanceQuery>, denom: String) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let marker: Marker = querier.get_marker_by_denom(&denom)?;
-    ///     // Do something with marker ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn get_marker_by_denom<S: Into<String>>(&self, denom: S) -> StdResult<Marker> {
-        self.query_marker(MarkerQueryParams::GetMarkerByDenom {
-            denom: validate_string(denom, "denom")?,
-        })
-    }
-
-    // Execute a scope query against the metadata module.
-    fn query_scope(&self, params: MetadataQueryParams) -> StdResult<Scope> {
-        let request = ProvenanceQuery {
-            route: ProvenanceRoute::Metadata,
-            params: ProvenanceQueryParams::Metadata(params),
-            version: String::from(QUERY_DATAFMT_VERSION),
-        };
-        let res: Scope = self.querier.query(&request.into())?;
-        Ok(res)
-    }
-
-    /// Get a scope by metadata ID (bech32 address string).
-    ///
-    /// ### Example
-    /// ```rust
-    /// // Imports required
-    /// use provwasm_std::{ProvenanceQuerier, ProvenanceQuery, Scope};
-    /// use cosmwasm_std::{Deps, QueryResponse, StdResult};
-    ///
-    /// // Query a scope by id.
-    /// fn try_get_scope(deps: Deps<ProvenanceQuery>, scope_id: String) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let scope: Scope = querier.get_scope(scope_id)?;
-    ///     // Do something with scope ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn get_scope<S: Into<String>>(&self, scope_id: S) -> StdResult<Scope> {
-        self.query_scope(MetadataQueryParams::GetScope {
-            scope_id: validate_string(scope_id, "scope_id")?,
-        })
-    }
-
-    // Execute a sessions query against the metadata module.
-    fn query_sessions(&self, params: MetadataQueryParams) -> StdResult<Sessions> {
-        let request = ProvenanceQuery {
-            route: ProvenanceRoute::Metadata,
-            params: ProvenanceQueryParams::Metadata(params),
-            version: String::from(QUERY_DATAFMT_VERSION),
-        };
-        let res: Sessions = self.querier.query(&request.into())?;
-        Ok(res)
-    }
-
-    /// Get all scope sessions.
-    ///
-    /// ### Example
-    /// ```rust
-    /// // Imports required
-    /// use provwasm_std::{ProvenanceQuerier, ProvenanceQuery, Sessions};
-    /// use cosmwasm_std::{Deps, QueryResponse, StdResult};
-    ///
-    /// // Query all sessions for a scope.
-    /// fn try_get_sessions(deps: Deps<ProvenanceQuery>, scope_id: String) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let res: Sessions = querier.get_sessions(scope_id)?;
-    ///     // Do something with res.sessions ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn get_sessions<S: Into<String>>(&self, scope_id: S) -> StdResult<Sessions> {
-        let scope_id = validate_string(scope_id, "scope_id")?;
-        self.query_sessions(MetadataQueryParams::GetSessions { scope_id })
-    }
-
-    // Execute a record query against the metadata module.
-    fn query_records(&self, params: MetadataQueryParams) -> StdResult<Records> {
-        let request = ProvenanceQuery {
-            route: ProvenanceRoute::Metadata,
-            params: ProvenanceQueryParams::Metadata(params),
-            version: String::from(QUERY_DATAFMT_VERSION),
-        };
-        let res: Records = self.querier.query(&request.into())?;
-        Ok(res)
-    }
-
-    /// Get all scope records.
-    ///
-    /// ### Example
-    /// ```rust
-    /// // Imports required
-    /// use provwasm_std::{ProvenanceQuerier, ProvenanceQuery, Records};
-    /// use cosmwasm_std::{Deps, QueryResponse, StdResult};
-    ///
-    /// // Query all records for a scope.
-    /// fn try_get_records(deps: Deps<ProvenanceQuery>, scope_id: String) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let res: Records = querier.get_records(scope_id)?;
-    ///     // Do something with res.records ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn get_records<S: Into<String>>(&self, scope_id: S) -> StdResult<Records> {
-        let scope_id = validate_string(scope_id, "scope_id")?;
-        let name: Option<String> = None;
-        self.query_records(MetadataQueryParams::GetRecords { scope_id, name })
-    }
-
-    /// Get a scope record with the given name.
-    ///
-    /// ### Example
-    /// ```rust
-    /// // Imports required
-    /// use provwasm_std::{ProvenanceQuerier, ProvenanceQuery, Record};
-    /// use cosmwasm_std::{Deps, QueryResponse, StdResult};
-    ///
-    /// // Query a loan record for a scope.
-    /// fn try_get_loan_record(deps: Deps<ProvenanceQuery>, scope_id: String) -> StdResult<QueryResponse> {
-    ///     let querier = ProvenanceQuerier::new(&deps.querier);
-    ///     let record: Record = querier.get_record_by_name(scope_id, "loan")?;
-    ///     // Do something with record ...
-    ///     todo!()
-    /// }
-    /// ```
-    pub fn get_record_by_name<S: Into<String>, T: Into<String>>(
-        &self,
-        scope_id: S,
-        name: T,
-    ) -> StdResult<Record> {
-        let scope_id = validate_string(scope_id, "scope_id")?;
-        let name: String = validate_string(name, "name")?;
-        let res = self.query_records(MetadataQueryParams::GetRecords {
-            scope_id,
-            name: Some(name.clone()),
-        })?;
-        if res.records.is_empty() {
-            return Err(StdError::not_found(format!("record not found: {name}")));
-        }
-        Ok(res.records[0].clone())
-    }
-}
diff --git a/packages/provwasm-std/src/query.rs b/packages/provwasm-std/src/query.rs
deleted file mode 100644
index 45543fd7..00000000
--- a/packages/provwasm-std/src/query.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use cosmwasm_std::{Addr, CustomQuery};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::types::ProvenanceRoute;
-
-/// Represents a request to query a custom provenance module.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct ProvenanceQuery {
-    pub route: ProvenanceRoute,        // The module router key
-    pub params: ProvenanceQueryParams, // The module-specific params
-    pub version: String,               // The data format version
-}
-
-// Indicate that ProvenanceQuery is a custom query to avoid conflicts with other types such as
-// BankQuery and WasmQuery.
-impl CustomQuery for ProvenanceQuery {}
-
-/// Input params for custom provenance queriers.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ProvenanceQueryParams {
-    Name(NameQueryParams),
-    Attribute(AttributeQueryParams),
-    Marker(MarkerQueryParams),
-    Metadata(MetadataQueryParams),
-}
-
-/// Params for name queries.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum NameQueryParams {
-    Resolve { name: String },
-    Lookup { address: Addr },
-}
-
-/// Params for attribute queries.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum AttributeQueryParams {
-    GetAttributes { address: Addr, name: String },
-    GetAllAttributes { address: Addr },
-}
-
-/// Params for marker queries.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MarkerQueryParams {
-    GetMarkerByAddress { address: Addr },
-    GetMarkerByDenom { denom: String },
-}
-
-/// Params for metadata queries
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MetadataQueryParams {
-    GetScope {
-        scope_id: String,
-    },
-    GetSessions {
-        scope_id: String,
-    },
-    GetRecords {
-        scope_id: String,
-        name: Option<String>,
-    },
-}
diff --git a/packages/provwasm-std/src/types/mod.rs b/packages/provwasm-std/src/types/mod.rs
index abd6a8f1..31a5fc73 100644
--- a/packages/provwasm-std/src/types/mod.rs
+++ b/packages/provwasm-std/src/types/mod.rs
@@ -1,344 +1,4 @@
 pub mod cosmos;
 pub mod cosmwasm;
+pub mod ibc;
 pub mod provenance;
-
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, Binary, Coin, Decimal};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-/// Supported provenance module router keys.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ProvenanceRoute {
-    Attribute,
-    Marker,
-    Name,
-    Metadata,
-    Msgfees,
-}
-
-/// A collection of bound names.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Names {
-    pub records: Vec<Name>,
-}
-
-/// A name bound to an address.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Name {
-    pub name: String,
-    pub address: Addr,
-    pub restricted: bool,
-}
-
-/// A type for name bindings
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Hash, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum NameBinding {
-    Restricted,
-    Unrestricted,
-}
-
-/// Bind names as restricted by default
-impl Default for NameBinding {
-    fn default() -> Self {
-        NameBinding::Restricted
-    }
-}
-
-/// A collection of attributes associated with an account address.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Attributes {
-    pub address: Addr,
-    #[serde(default)]
-    pub attributes: Vec<Attribute>,
-}
-
-/// Allowed attribute value types.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum AttributeValueType {
-    Uuid,
-    Json,
-    String,
-    Bytes,
-    Uri,
-    Int,
-    Float,
-    Proto,
-    Unspecified,
-}
-
-/// A typed key-value pair.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Attribute {
-    pub name: String,
-    pub value: Binary,
-    #[serde(rename(serialize = "type", deserialize = "type"))]
-    pub value_type: AttributeValueType,
-}
-
-/// A marker account
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Marker {
-    pub address: Addr,
-    pub allow_forced_transfer: bool,
-    #[serde(default)]
-    pub coins: Vec<Coin>,
-    pub account_number: u64,
-    pub sequence: u64,
-    #[serde(default)]
-    pub manager: String,
-    pub permissions: Vec<AccessGrant>,
-    pub status: MarkerStatus,
-    pub denom: String,
-    pub total_supply: Decimal,
-    pub marker_type: MarkerType,
-    pub supply_fixed: bool,
-}
-
-impl Marker {
-    /// Determines whether a marker requires restricted transfers.
-    pub fn bank_sends_disabled(&self) -> bool {
-        matches!(self.marker_type, MarkerType::Restricted)
-    }
-}
-
-/// Marker permissions granted to another account.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct AccessGrant {
-    pub permissions: Vec<MarkerAccess>,
-    pub address: Addr,
-}
-
-/// Marker permission types.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MarkerAccess {
-    Admin,
-    Burn,
-    Deposit,
-    Delete,
-    Mint,
-    Transfer,
-    Unspecified,
-    Withdraw,
-}
-
-impl MarkerAccess {
-    /// A helper that returns all permissions that can be granted.
-    pub fn all() -> Vec<MarkerAccess> {
-        vec![
-            MarkerAccess::Admin,
-            MarkerAccess::Burn,
-            MarkerAccess::Deposit,
-            MarkerAccess::Delete,
-            MarkerAccess::Mint,
-            MarkerAccess::Transfer,
-            MarkerAccess::Withdraw,
-        ]
-    }
-}
-
-/// Marker types.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MarkerType {
-    Coin,
-    Restricted,
-    Unspecified,
-}
-
-/// Marker status types.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum MarkerStatus {
-    Active,
-    Cancelled,
-    Destroyed,
-    Finalized,
-    Proposed,
-    Unspecified,
-}
-
-/// A collection of records owned by one or more parties.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Scope {
-    pub scope_id: String,
-    pub specification_id: String,
-    #[serde(default)]
-    pub owners: Vec<Party>,
-    #[serde(default)]
-    pub data_access: Vec<Addr>,
-    pub value_owner_address: Addr,
-}
-
-/// The final state of an execution context for a specification instance.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Session {
-    pub name: String,
-    pub session_id: String,
-    pub specification_id: String,
-    #[serde(default)]
-    pub parties: Vec<Party>,
-    pub context: Binary,
-}
-
-/// A group of sessions.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Sessions {
-    pub sessions: Vec<Session>,
-}
-
-/// A record of fact for a session.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Record {
-    pub name: String,
-    pub session_id: String,
-    pub specification_id: String,
-    pub process: Process,
-    #[serde(default)]
-    pub inputs: Vec<RecordInput>,
-    #[serde(default)]
-    pub outputs: Vec<RecordOutput>,
-}
-
-/// A group of records.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Records {
-    pub records: Vec<Record>,
-}
-
-/// An address with an associated role.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Party {
-    pub address: Addr,
-    pub role: PartyType,
-}
-
-/// Roles that can be associated to a party.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum PartyType {
-    Originator,
-    Servicer,
-    Investor,
-    Custodian,
-    Owner,
-    Affiliate,
-    Omnibus,
-    Provenance,
-    Unspecified,
-}
-
-/// The process that generated a record.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct Process {
-    pub process_id: ProcessId,
-    pub method: String,
-    pub name: String,
-}
-
-/// The representations of a process id.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ProcessId {
-    /// The on-chain address of a process.
-    Address { address: String },
-    /// The hash of an off-chain process.
-    Hash { hash: String },
-}
-
-/// The inputs used to produce a record.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct RecordInput {
-    pub name: String,
-    pub type_name: String,
-    pub source: RecordInputSource,
-    pub status: RecordInputStatus,
-}
-
-/// The representations of a record input source.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum RecordInputSource {
-    /// The address of a record on chain (established records).
-    Record { record_id: String },
-    /// The hash of an off-chain piece of information (proposed records).
-    Hash { hash: String },
-}
-
-/// Record input types.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum RecordInputStatus {
-    Proposed,
-    Record,
-    Unspecified,
-}
-
-/// The output of a process recorded on chain.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct RecordOutput {
-    pub hash: String,
-    pub status: ResultStatus,
-}
-
-/// Result status types.
-#[deprecated(since = "2.0.0")]
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ResultStatus {
-    Pass,
-    Skip,
-    Fail,
-    Unspecified,
-}
-
-#[deprecated(since = "2.0.0")]
-#[cw_serde]
-pub struct Fee {
-    pub recipient: Option<Addr>,
-    pub amount: Coin,
-}

From 45bbbc5c6dc2d9c40b54a47fa78479d48c3de505 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:42:03 -0600
Subject: [PATCH 35/64] update generated types to 1.17.1 protos

---
 .../src/types/cosmos/gov/v1beta1.rs           | 169 ------------------
 .../src/types/provenance/exchange/v1.rs       |  13 --
 .../src/types/provenance/marker/v1.rs         |  46 +++++
 .../src/types/provenance/metadata/v1.rs       | 117 +++++++++++-
 .../src/types/provenance/msgfees/v1.rs        | 113 ++++++++++++
 5 files changed, 267 insertions(+), 191 deletions(-)

diff --git a/packages/provwasm-std/src/types/cosmos/gov/v1beta1.rs b/packages/provwasm-std/src/types/cosmos/gov/v1beta1.rs
index 0acbc167..d8a62ee5 100644
--- a/packages/provwasm-std/src/types/cosmos/gov/v1beta1.rs
+++ b/packages/provwasm-std/src/types/cosmos/gov/v1beta1.rs
@@ -54,68 +54,6 @@ pub struct Deposit {
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
-#[proto_message(type_url = "/cosmos.gov.v1beta1.Proposal")]
-#[serde(rename_all = "snake_case")]
-pub struct Proposal {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub proposal_id: u64,
-    #[prost(message, optional, tag = "2")]
-    pub content: ::core::option::Option<crate::shim::Any>,
-    #[prost(enumeration = "ProposalStatus", tag = "3")]
-    #[serde(
-        serialize_with = "ProposalStatus::serialize",
-        deserialize_with = "ProposalStatus::deserialize"
-    )]
-    pub status: i32,
-    #[prost(message, optional, tag = "4")]
-    pub final_tally_result: ::core::option::Option<TallyResult>,
-    #[prost(message, optional, tag = "5")]
-    pub submit_time: ::core::option::Option<crate::shim::Timestamp>,
-    #[prost(message, optional, tag = "6")]
-    pub deposit_end_time: ::core::option::Option<crate::shim::Timestamp>,
-    #[prost(message, repeated, tag = "7")]
-    pub total_deposit: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
-    #[prost(message, optional, tag = "8")]
-    pub voting_start_time: ::core::option::Option<crate::shim::Timestamp>,
-    #[prost(message, optional, tag = "9")]
-    pub voting_end_time: ::core::option::Option<crate::shim::Timestamp>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    ::prost::Message,
-    schemars::JsonSchema,
-    serde::Serialize,
-    serde::Deserialize,
-    provwasm_proc_macro::CosmwasmExt,
-)]
-#[proto_message(type_url = "/cosmos.gov.v1beta1.TallyResult")]
-#[serde(rename_all = "snake_case")]
-pub struct TallyResult {
-    #[prost(string, tag = "1")]
-    pub yes: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub abstain: ::prost::alloc::string::String,
-    #[prost(string, tag = "3")]
-    pub no: ::prost::alloc::string::String,
-    #[prost(string, tag = "4")]
-    pub no_with_veto: ::prost::alloc::string::String,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    ::prost::Message,
-    schemars::JsonSchema,
-    serde::Serialize,
-    serde::Deserialize,
-    provwasm_proc_macro::CosmwasmExt,
-)]
 #[proto_message(type_url = "/cosmos.gov.v1beta1.Vote")]
 #[serde(rename_all = "snake_case")]
 pub struct Vote {
@@ -261,107 +199,6 @@ impl VoteOption {
         }
     }
 }
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-#[derive(strum_macros::FromRepr, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ProposalStatus {
-    Unspecified = 0,
-    DepositPeriod = 1,
-    VotingPeriod = 2,
-    Passed = 3,
-    Rejected = 4,
-    Failed = 5,
-}
-impl ProposalStatus {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            ProposalStatus::Unspecified => "PROPOSAL_STATUS_UNSPECIFIED",
-            ProposalStatus::DepositPeriod => "PROPOSAL_STATUS_DEPOSIT_PERIOD",
-            ProposalStatus::VotingPeriod => "PROPOSAL_STATUS_VOTING_PERIOD",
-            ProposalStatus::Passed => "PROPOSAL_STATUS_PASSED",
-            ProposalStatus::Rejected => "PROPOSAL_STATUS_REJECTED",
-            ProposalStatus::Failed => "PROPOSAL_STATUS_FAILED",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "PROPOSAL_STATUS_UNSPECIFIED" => Some(Self::Unspecified),
-            "PROPOSAL_STATUS_DEPOSIT_PERIOD" => Some(Self::DepositPeriod),
-            "PROPOSAL_STATUS_VOTING_PERIOD" => Some(Self::VotingPeriod),
-            "PROPOSAL_STATUS_PASSED" => Some(Self::Passed),
-            "PROPOSAL_STATUS_REJECTED" => Some(Self::Rejected),
-            "PROPOSAL_STATUS_FAILED" => Some(Self::Failed),
-            _ => None,
-        }
-    }
-    pub fn serialize<S>(v: &i32, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        let enum_value = Self::from_repr(*v);
-        match enum_value {
-            Some(v) => serializer.serialize_str(v.as_str_name()),
-            None => Err(serde::ser::Error::custom("unknown value")),
-        }
-    }
-    pub fn deserialize<'de, D>(deserializer: D) -> std::result::Result<i32, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        use serde::de::Deserialize;
-        let s = String::deserialize(deserializer)?;
-        match Self::from_str_name(&s) {
-            Some(v) => Ok(v.into()),
-            None => Err(serde::de::Error::custom("unknown value")),
-        }
-    }
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    ::prost::Message,
-    schemars::JsonSchema,
-    serde::Serialize,
-    serde::Deserialize,
-    provwasm_proc_macro::CosmwasmExt,
-)]
-#[proto_message(type_url = "/cosmos.gov.v1beta1.QueryProposalRequest")]
-#[serde(rename_all = "snake_case")]
-#[proto_query(
-    path = "/cosmos.gov.v1beta1.Query/Proposal",
-    response_type = QueryProposalResponse
-)]
-pub struct QueryProposalRequest {
-    #[prost(uint64, tag = "1")]
-    #[serde(
-        serialize_with = "crate::serde::as_str::serialize",
-        deserialize_with = "crate::serde::as_str::deserialize"
-    )]
-    pub proposal_id: u64,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    ::prost::Message,
-    schemars::JsonSchema,
-    serde::Serialize,
-    serde::Deserialize,
-    provwasm_proc_macro::CosmwasmExt,
-)]
-#[proto_message(type_url = "/cosmos.gov.v1beta1.QueryProposalResponse")]
-#[serde(rename_all = "snake_case")]
-pub struct QueryProposalResponse {
-    #[prost(message, optional, tag = "1")]
-    pub proposal: ::core::option::Option<Proposal>,
-}
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -574,12 +411,6 @@ impl<'a, Q: cosmwasm_std::CustomQuery> GovQuerier<'a, Q> {
     pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
         Self { querier }
     }
-    pub fn proposal(
-        &self,
-        proposal_id: u64,
-    ) -> std::result::Result<QueryProposalResponse, cosmwasm_std::StdError> {
-        QueryProposalRequest { proposal_id }.query(self.querier)
-    }
     pub fn vote(
         &self,
         proposal_id: u64,
diff --git a/packages/provwasm-std/src/types/provenance/exchange/v1.rs b/packages/provwasm-std/src/types/provenance/exchange/v1.rs
index 5e47e55b..0be61db8 100644
--- a/packages/provwasm-std/src/types/provenance/exchange/v1.rs
+++ b/packages/provwasm-std/src/types/provenance/exchange/v1.rs
@@ -324,19 +324,6 @@ pub struct EventMarketFeesUpdated {
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
-#[proto_message(type_url = "/provenance.exchange.v1.EventParamsUpdated")]
-#[serde(rename_all = "snake_case")]
-pub struct EventParamsUpdated {}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(
-    Clone,
-    PartialEq,
-    ::prost::Message,
-    schemars::JsonSchema,
-    serde::Serialize,
-    serde::Deserialize,
-    provwasm_proc_macro::CosmwasmExt,
-)]
 #[proto_message(type_url = "/provenance.exchange.v1.MarketAccount")]
 #[serde(rename_all = "snake_case")]
 pub struct MarketAccount {
diff --git a/packages/provwasm-std/src/types/provenance/marker/v1.rs b/packages/provwasm-std/src/types/provenance/marker/v1.rs
index 72e77b6f..d3f5d345 100644
--- a/packages/provwasm-std/src/types/provenance/marker/v1.rs
+++ b/packages/provwasm-std/src/types/provenance/marker/v1.rs
@@ -155,6 +155,7 @@ pub struct MarkerTransferAuthorization {
 #[proto_message(type_url = "/provenance.marker.v1.Params")]
 #[serde(rename_all = "snake_case")]
 pub struct Params {
+    #[deprecated]
     #[prost(uint64, tag = "1")]
     #[serde(
         serialize_with = "crate::serde::as_str::serialize",
@@ -165,6 +166,8 @@ pub struct Params {
     pub enable_governance: bool,
     #[prost(string, tag = "3")]
     pub unrestricted_denom_regex: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub max_supply: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1225,6 +1228,18 @@ pub struct MsgAddMarkerRequest {
     pub allow_forced_transfer: bool,
     #[prost(string, repeated, tag = "11")]
     pub required_attributes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(uint64, tag = "12")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub usd_cents: u64,
+    #[prost(uint64, tag = "13")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub volume: u64,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1571,6 +1586,25 @@ pub struct MsgTransferResponse {}
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.marker.v1.MsgIbcTransferRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgIbcTransferRequest {
+    #[prost(message, optional, tag = "1")]
+    pub transfer:
+        ::core::option::Option<super::super::super::ibc::applications::transfer::v1::MsgTransfer>,
+    #[prost(string, tag = "2")]
+    pub administrator: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
 #[proto_message(type_url = "/provenance.marker.v1.MsgIbcTransferResponse")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgIbcTransferResponse {}
@@ -1640,6 +1674,18 @@ pub struct MsgAddFinalizeActivateMarkerRequest {
     pub allow_forced_transfer: bool,
     #[prost(string, repeated, tag = "10")]
     pub required_attributes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(uint64, tag = "11")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub usd_cents: u64,
+    #[prost(uint64, tag = "12")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub volume: u64,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
diff --git a/packages/provwasm-std/src/types/provenance/metadata/v1.rs b/packages/provwasm-std/src/types/provenance/metadata/v1.rs
index d31a8180..5a52d566 100644
--- a/packages/provwasm-std/src/types/provenance/metadata/v1.rs
+++ b/packages/provwasm-std/src/types/provenance/metadata/v1.rs
@@ -1381,7 +1381,10 @@ pub struct OsLocatorParams {
     path = "/provenance.metadata.v1.Query/Params",
     response_type = QueryParamsResponse
 )]
-pub struct QueryParamsRequest {}
+pub struct QueryParamsRequest {
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
+}
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -1427,6 +1430,10 @@ pub struct ScopeRequest {
     pub include_sessions: bool,
     #[prost(bool, tag = "11")]
     pub include_records: bool,
+    #[prost(bool, tag = "12")]
+    pub exclude_id_info: bool,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1499,6 +1506,10 @@ pub struct SessionsRequest {
     pub include_scope: bool,
     #[prost(bool, tag = "11")]
     pub include_records: bool,
+    #[prost(bool, tag = "12")]
+    pub exclude_id_info: bool,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1571,6 +1582,10 @@ pub struct RecordsRequest {
     pub include_scope: bool,
     #[prost(bool, tag = "11")]
     pub include_sessions: bool,
+    #[prost(bool, tag = "12")]
+    pub exclude_id_info: bool,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1633,6 +1648,8 @@ pub struct RecordWrapper {
 pub struct OwnershipRequest {
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
     #[prost(message, optional, tag = "99")]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
@@ -1677,6 +1694,8 @@ pub struct OwnershipResponse {
 pub struct ValueOwnershipRequest {
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
     #[prost(message, optional, tag = "99")]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
@@ -1725,6 +1744,10 @@ pub struct ScopeSpecificationRequest {
     pub include_contract_specs: bool,
     #[prost(bool, tag = "11")]
     pub include_record_specs: bool,
+    #[prost(bool, tag = "12")]
+    pub exclude_id_info: bool,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1787,6 +1810,10 @@ pub struct ContractSpecificationRequest {
     pub specification_id: ::prost::alloc::string::String,
     #[prost(bool, tag = "10")]
     pub include_record_specs: bool,
+    #[prost(bool, tag = "12")]
+    pub exclude_id_info: bool,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1847,6 +1874,10 @@ pub struct ContractSpecificationWrapper {
 pub struct RecordSpecificationsForContractSpecificationRequest {
     #[prost(string, tag = "1")]
     pub specification_id: ::prost::alloc::string::String,
+    #[prost(bool, tag = "12")]
+    pub exclude_id_info: bool,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1893,6 +1924,10 @@ pub struct RecordSpecificationRequest {
     pub specification_id: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub name: ::prost::alloc::string::String,
+    #[prost(bool, tag = "12")]
+    pub exclude_id_info: bool,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1946,7 +1981,10 @@ pub struct RecordSpecificationWrapper {
     path = "/provenance.metadata.v1.Query/OSLocatorParams",
     response_type = OsLocatorParamsResponse
 )]
-pub struct OsLocatorParamsRequest {}
+pub struct OsLocatorParamsRequest {
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
+}
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
     Clone,
@@ -1984,6 +2022,8 @@ pub struct OsLocatorParamsResponse {
 pub struct OsLocatorRequest {
     #[prost(string, tag = "1")]
     pub owner: ::prost::alloc::string::String,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -2022,6 +2062,8 @@ pub struct OsLocatorResponse {
 pub struct OsLocatorsByUriRequest {
     #[prost(string, tag = "1")]
     pub uri: ::prost::alloc::string::String,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
     #[prost(message, optional, tag = "99")]
     pub pagination:
         ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
@@ -2066,6 +2108,8 @@ pub struct OsLocatorsByUriResponse {
 pub struct OsLocatorsByScopeRequest {
     #[prost(string, tag = "1")]
     pub scope_id: ::prost::alloc::string::String,
+    #[prost(bool, tag = "98")]
+    pub include_request: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -2915,8 +2959,11 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
     pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
         Self { querier }
     }
-    pub fn params(&self) -> std::result::Result<QueryParamsResponse, cosmwasm_std::StdError> {
-        QueryParamsRequest {}.query(self.querier)
+    pub fn params(
+        &self,
+        include_request: bool,
+    ) -> std::result::Result<QueryParamsResponse, cosmwasm_std::StdError> {
+        QueryParamsRequest { include_request }.query(self.querier)
     }
     pub fn scope(
         &self,
@@ -2925,6 +2972,8 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
         record_addr: ::prost::alloc::string::String,
         include_sessions: bool,
         include_records: bool,
+        exclude_id_info: bool,
+        include_request: bool,
     ) -> std::result::Result<ScopeResponse, cosmwasm_std::StdError> {
         ScopeRequest {
             scope_id,
@@ -2932,6 +2981,8 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
             record_addr,
             include_sessions,
             include_records,
+            exclude_id_info,
+            include_request,
         }
         .query(self.querier)
     }
@@ -2943,6 +2994,8 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
         record_name: ::prost::alloc::string::String,
         include_scope: bool,
         include_records: bool,
+        exclude_id_info: bool,
+        include_request: bool,
     ) -> std::result::Result<SessionsResponse, cosmwasm_std::StdError> {
         SessionsRequest {
             scope_id,
@@ -2951,6 +3004,8 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
             record_name,
             include_scope,
             include_records,
+            exclude_id_info,
+            include_request,
         }
         .query(self.querier)
     }
@@ -2962,6 +3017,8 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
         name: ::prost::alloc::string::String,
         include_scope: bool,
         include_sessions: bool,
+        exclude_id_info: bool,
+        include_request: bool,
     ) -> std::result::Result<RecordsResponse, cosmwasm_std::StdError> {
         RecordsRequest {
             record_addr,
@@ -2970,18 +3027,22 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
             name,
             include_scope,
             include_sessions,
+            exclude_id_info,
+            include_request,
         }
         .query(self.querier)
     }
     pub fn ownership(
         &self,
         address: ::prost::alloc::string::String,
+        include_request: bool,
         pagination: ::core::option::Option<
             super::super::super::cosmos::base::query::v1beta1::PageRequest,
         >,
     ) -> std::result::Result<OwnershipResponse, cosmwasm_std::StdError> {
         OwnershipRequest {
             address,
+            include_request,
             pagination,
         }
         .query(self.querier)
@@ -2989,12 +3050,14 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
     pub fn value_ownership(
         &self,
         address: ::prost::alloc::string::String,
+        include_request: bool,
         pagination: ::core::option::Option<
             super::super::super::cosmos::base::query::v1beta1::PageRequest,
         >,
     ) -> std::result::Result<ValueOwnershipResponse, cosmwasm_std::StdError> {
         ValueOwnershipRequest {
             address,
+            include_request,
             pagination,
         }
         .query(self.querier)
@@ -3004,11 +3067,15 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
         specification_id: ::prost::alloc::string::String,
         include_contract_specs: bool,
         include_record_specs: bool,
+        exclude_id_info: bool,
+        include_request: bool,
     ) -> std::result::Result<ScopeSpecificationResponse, cosmwasm_std::StdError> {
         ScopeSpecificationRequest {
             specification_id,
             include_contract_specs,
             include_record_specs,
+            exclude_id_info,
+            include_request,
         }
         .query(self.querier)
     }
@@ -3016,57 +3083,89 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MetadataQuerier<'a, Q> {
         &self,
         specification_id: ::prost::alloc::string::String,
         include_record_specs: bool,
+        exclude_id_info: bool,
+        include_request: bool,
     ) -> std::result::Result<ContractSpecificationResponse, cosmwasm_std::StdError> {
         ContractSpecificationRequest {
             specification_id,
             include_record_specs,
+            exclude_id_info,
+            include_request,
         }
         .query(self.querier)
     }
     pub fn record_specifications_for_contract_specification(
         &self,
         specification_id: ::prost::alloc::string::String,
+        exclude_id_info: bool,
+        include_request: bool,
     ) -> std::result::Result<
         RecordSpecificationsForContractSpecificationResponse,
         cosmwasm_std::StdError,
     > {
-        RecordSpecificationsForContractSpecificationRequest { specification_id }.query(self.querier)
+        RecordSpecificationsForContractSpecificationRequest {
+            specification_id,
+            exclude_id_info,
+            include_request,
+        }
+        .query(self.querier)
     }
     pub fn record_specification(
         &self,
         specification_id: ::prost::alloc::string::String,
         name: ::prost::alloc::string::String,
+        exclude_id_info: bool,
+        include_request: bool,
     ) -> std::result::Result<RecordSpecificationResponse, cosmwasm_std::StdError> {
         RecordSpecificationRequest {
             specification_id,
             name,
+            exclude_id_info,
+            include_request,
         }
         .query(self.querier)
     }
     pub fn os_locator_params(
         &self,
+        include_request: bool,
     ) -> std::result::Result<OsLocatorParamsResponse, cosmwasm_std::StdError> {
-        OsLocatorParamsRequest {}.query(self.querier)
+        OsLocatorParamsRequest { include_request }.query(self.querier)
     }
     pub fn os_locator(
         &self,
         owner: ::prost::alloc::string::String,
+        include_request: bool,
     ) -> std::result::Result<OsLocatorResponse, cosmwasm_std::StdError> {
-        OsLocatorRequest { owner }.query(self.querier)
+        OsLocatorRequest {
+            owner,
+            include_request,
+        }
+        .query(self.querier)
     }
     pub fn os_locators_by_uri(
         &self,
         uri: ::prost::alloc::string::String,
+        include_request: bool,
         pagination: ::core::option::Option<
             super::super::super::cosmos::base::query::v1beta1::PageRequest,
         >,
     ) -> std::result::Result<OsLocatorsByUriResponse, cosmwasm_std::StdError> {
-        OsLocatorsByUriRequest { uri, pagination }.query(self.querier)
+        OsLocatorsByUriRequest {
+            uri,
+            include_request,
+            pagination,
+        }
+        .query(self.querier)
     }
     pub fn os_locators_by_scope(
         &self,
         scope_id: ::prost::alloc::string::String,
+        include_request: bool,
     ) -> std::result::Result<OsLocatorsByScopeResponse, cosmwasm_std::StdError> {
-        OsLocatorsByScopeRequest { scope_id }.query(self.querier)
+        OsLocatorsByScopeRequest {
+            scope_id,
+            include_request,
+        }
+        .query(self.querier)
     }
 }
diff --git a/packages/provwasm-std/src/types/provenance/msgfees/v1.rs b/packages/provwasm-std/src/types/provenance/msgfees/v1.rs
index c03ec743..d60f9ffb 100644
--- a/packages/provwasm-std/src/types/provenance/msgfees/v1.rs
+++ b/packages/provwasm-std/src/types/provenance/msgfees/v1.rs
@@ -125,6 +125,98 @@ pub struct QueryParamsResponse {
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.msgfees.v1.QueryAllMsgFeesRequest")]
+#[serde(rename_all = "snake_case")]
+#[proto_query(
+    path = "/provenance.msgfees.v1.Query/QueryAllMsgFees",
+    response_type = QueryAllMsgFeesResponse
+)]
+pub struct QueryAllMsgFeesRequest {
+    #[prost(message, optional, tag = "2")]
+    pub pagination:
+        ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/provenance.msgfees.v1.QueryAllMsgFeesResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct QueryAllMsgFeesResponse {
+    #[prost(message, repeated, tag = "1")]
+    pub msg_fees: ::prost::alloc::vec::Vec<MsgFee>,
+    #[prost(message, optional, tag = "2")]
+    pub pagination:
+        ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/provenance.msgfees.v1.CalculateTxFeesRequest")]
+#[serde(rename_all = "snake_case")]
+#[proto_query(
+    path = "/provenance.msgfees.v1.Query/CalculateTxFees",
+    response_type = CalculateTxFeesResponse
+)]
+pub struct CalculateTxFeesRequest {
+    #[prost(bytes = "vec", tag = "1")]
+    #[serde(
+        serialize_with = "crate::serde::as_base64::serialize",
+        deserialize_with = "crate::serde::as_base64::deserialize"
+    )]
+    pub tx_bytes: ::prost::alloc::vec::Vec<u8>,
+    #[prost(string, tag = "2")]
+    pub default_base_denom: ::prost::alloc::string::String,
+    #[prost(float, tag = "3")]
+    pub gas_adjustment: f32,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/provenance.msgfees.v1.CalculateTxFeesResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct CalculateTxFeesResponse {
+    #[prost(message, repeated, tag = "1")]
+    pub additional_fees: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(message, repeated, tag = "2")]
+    pub total_fees: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(uint64, tag = "3")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub estimated_gas: u64,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
 #[proto_message(type_url = "/provenance.msgfees.v1.MsgAssessCustomMsgFeeRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgAssessCustomMsgFeeRequest {
@@ -162,4 +254,25 @@ impl<'a, Q: cosmwasm_std::CustomQuery> MsgfeesQuerier<'a, Q> {
     pub fn params(&self) -> std::result::Result<QueryParamsResponse, cosmwasm_std::StdError> {
         QueryParamsRequest {}.query(self.querier)
     }
+    pub fn query_all_msg_fees(
+        &self,
+        pagination: ::core::option::Option<
+            super::super::super::cosmos::base::query::v1beta1::PageRequest,
+        >,
+    ) -> std::result::Result<QueryAllMsgFeesResponse, cosmwasm_std::StdError> {
+        QueryAllMsgFeesRequest { pagination }.query(self.querier)
+    }
+    pub fn calculate_tx_fees(
+        &self,
+        tx_bytes: ::prost::alloc::vec::Vec<u8>,
+        default_base_denom: ::prost::alloc::string::String,
+        gas_adjustment: f32,
+    ) -> std::result::Result<CalculateTxFeesResponse, cosmwasm_std::StdError> {
+        CalculateTxFeesRequest {
+            tx_bytes,
+            default_base_denom,
+            gas_adjustment,
+        }
+        .query(self.querier)
+    }
 }

From df343f427996c5c0aeead0a5a7e80806bd16a818 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:42:31 -0600
Subject: [PATCH 36/64] comment unused proto-build transformer function

---
 packages/proto-build/src/transformers.rs | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/proto-build/src/transformers.rs b/packages/proto-build/src/transformers.rs
index 6c3f602e..323f7085 100644
--- a/packages/proto-build/src/transformers.rs
+++ b/packages/proto-build/src/transformers.rs
@@ -486,20 +486,20 @@ fn find_prost_enumeration_value(attrs: &[Attribute]) -> Option<String> {
     })
 }
 
-fn has_prost_one_of_attr(attrs: &[Attribute]) -> bool {
-    attrs.iter().any(|attr| {
-        // Check if the attribute name is "prost".
-        if !attr.path().is_ident("prost") {
-            return false;
-        }
-
-        // Parse all nested items inside the attribute
-        let list = attr.meta.require_list().unwrap();
-        let nested = list
-            .parse_args_with(Punctuated::<Meta, Token![,]>::parse_terminated)
-            .unwrap();
-
-        // Search all nested items and look for the "oneof" attribute.
-        nested.iter().any(|meta| meta.path().is_ident("oneof"))
-    })
-}
+// fn has_prost_one_of_attr(attrs: &[Attribute]) -> bool {
+//     attrs.iter().any(|attr| {
+//         // Check if the attribute name is "prost".
+//         if !attr.path().is_ident("prost") {
+//             return false;
+//         }
+//
+//         // Parse all nested items inside the attribute
+//         let list = attr.meta.require_list().unwrap();
+//         let nested = list
+//             .parse_args_with(Punctuated::<Meta, Token![,]>::parse_terminated)
+//             .unwrap();
+//
+//         // Search all nested items and look for the "oneof" attribute.
+//         nested.iter().any(|meta| meta.path().is_ident("oneof"))
+//     })
+// }

From d7cfda3fca83156f40b8031e600931af025e4a4c Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:54:08 -0600
Subject: [PATCH 37/64] remove deprecated helper addr validation functions

---
 packages/provwasm-std/src/common.rs | 51 -----------------------------
 packages/provwasm-std/src/lib.rs    |  1 -
 2 files changed, 52 deletions(-)
 delete mode 100644 packages/provwasm-std/src/common.rs

diff --git a/packages/provwasm-std/src/common.rs b/packages/provwasm-std/src/common.rs
deleted file mode 100644
index cce3f4da..00000000
--- a/packages/provwasm-std/src/common.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use cosmwasm_std::{Addr, StdError, StdResult};
-
-/// A helper that ensures string params are non-empty.
-pub fn validate_string<S: Into<String>>(input: S, param_name: &str) -> StdResult<String> {
-    let s: String = input.into();
-    if s.trim().is_empty() {
-        let errm = format!("{} must not be empty", param_name);
-        Err(StdError::generic_err(errm))
-    } else {
-        Ok(s)
-    }
-}
-
-/// A helper that ensures address params are non-empty.
-pub fn validate_address<H: Into<Addr>>(input: H) -> StdResult<Addr> {
-    let h: Addr = input.into();
-    if h.to_string().trim().is_empty() {
-        Err(StdError::generic_err("address must not be empty"))
-    } else {
-        Ok(h)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn validate_string_empty() {
-        let whitespace = " \r \n \t ";
-        let err = validate_string(whitespace, "whitespace").unwrap_err();
-        match err {
-            StdError::GenericErr { msg, .. } => {
-                assert_eq!(msg, "whitespace must not be empty")
-            }
-            _ => panic!("unexpected error"),
-        }
-    }
-
-    #[test]
-    fn validate_address_empty() {
-        let empty = Addr::unchecked("    ");
-        let err = validate_address(empty).unwrap_err();
-        match err {
-            StdError::GenericErr { msg, .. } => {
-                assert_eq!(msg, "address must not be empty")
-            }
-            _ => panic!("unexpected error"),
-        }
-    }
-}
diff --git a/packages/provwasm-std/src/lib.rs b/packages/provwasm-std/src/lib.rs
index 819741b4..a9410b76 100644
--- a/packages/provwasm-std/src/lib.rs
+++ b/packages/provwasm-std/src/lib.rs
@@ -1,7 +1,6 @@
 /// The version (commit hash) of the Cosmos SDK used when generating this library.
 pub const PROVENANCE_VERSION: &str = include_str!("types/PROVENANCE_COMMIT");
 
-mod common;
 mod serde;
 pub mod shim;
 pub mod types;

From bd7e4d6e41b21345ad4bc41a9699a38a8f54c5bb Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:58:38 -0600
Subject: [PATCH 38/64] remove empty queriers

---
 .../provwasm-std/src/types/ibc/applications/fee/v1.rs     | 8 --------
 .../ibc/applications/interchain_accounts/controller/v1.rs | 8 --------
 .../src/types/ibc/applications/transfer/v1.rs             | 8 --------
 3 files changed, 24 deletions(-)

diff --git a/packages/provwasm-std/src/types/ibc/applications/fee/v1.rs b/packages/provwasm-std/src/types/ibc/applications/fee/v1.rs
index 65954fea..6d0ccdb5 100644
--- a/packages/provwasm-std/src/types/ibc/applications/fee/v1.rs
+++ b/packages/provwasm-std/src/types/ibc/applications/fee/v1.rs
@@ -177,11 +177,3 @@ pub struct MsgPayPacketFeeAsync {
 #[proto_message(type_url = "/ibc.applications.fee.v1.MsgPayPacketFeeAsyncResponse")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgPayPacketFeeAsyncResponse {}
-pub struct FeeQuerier<'a, Q: cosmwasm_std::CustomQuery> {
-    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
-}
-impl<'a, Q: cosmwasm_std::CustomQuery> FeeQuerier<'a, Q> {
-    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
-        Self { querier }
-    }
-}
diff --git a/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs
index f6c79e33..55d4a7d3 100644
--- a/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs
+++ b/packages/provwasm-std/src/types/ibc/applications/interchain_accounts/controller/v1.rs
@@ -84,11 +84,3 @@ pub struct MsgSendTxResponse {
     )]
     pub sequence: u64,
 }
-pub struct ControllerQuerier<'a, Q: cosmwasm_std::CustomQuery> {
-    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
-}
-impl<'a, Q: cosmwasm_std::CustomQuery> ControllerQuerier<'a, Q> {
-    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
-        Self { querier }
-    }
-}
diff --git a/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs b/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
index 47ce4355..84963e36 100644
--- a/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
+++ b/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
@@ -52,11 +52,3 @@ pub struct MsgTransferResponse {
     )]
     pub sequence: u64,
 }
-pub struct TransferQuerier<'a, Q: cosmwasm_std::CustomQuery> {
-    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
-}
-impl<'a, Q: cosmwasm_std::CustomQuery> TransferQuerier<'a, Q> {
-    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
-        Self { querier }
-    }
-}

From e48b4af422a2096a1ff59fe52fb79fd51d9f4159 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:02:35 -0600
Subject: [PATCH 39/64] add ibc QueryDenomTrace msg types

---
 packages/proto-build/third-party.buf.gen.yaml |  4 +-
 .../src/types/ibc/applications/transfer/v1.rs | 68 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/packages/proto-build/third-party.buf.gen.yaml b/packages/proto-build/third-party.buf.gen.yaml
index 2c1d3fe0..50d2eb43 100644
--- a/packages/proto-build/third-party.buf.gen.yaml
+++ b/packages/proto-build/third-party.buf.gen.yaml
@@ -104,4 +104,6 @@ types:
     - ibc.applications.interchain_accounts.controller.v1.MsgSendTx
     - ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse
     - ibc.applications.transfer.v1.MsgTransfer
-    - ibc.applications.transfer.v1.MsgTransferResponse
\ No newline at end of file
+    - ibc.applications.transfer.v1.MsgTransferResponse
+    - ibc.applications.transfer.v1.QueryDenomTraceRequest
+    - ibc.applications.transfer.v1.QueryDenomTraceResponse
\ No newline at end of file
diff --git a/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs b/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
index 84963e36..edceafd4 100644
--- a/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
+++ b/packages/provwasm-std/src/types/ibc/applications/transfer/v1.rs
@@ -8,6 +8,60 @@
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/ibc.applications.transfer.v1.DenomTrace")]
+#[serde(rename_all = "snake_case")]
+pub struct DenomTrace {
+    #[prost(string, tag = "1")]
+    pub path: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub base_denom: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.transfer.v1.QueryDenomTraceRequest")]
+#[serde(rename_all = "snake_case")]
+#[proto_query(
+    path = "/ibc.applications.transfer.v1.Query/DenomTrace",
+    response_type = QueryDenomTraceResponse
+)]
+pub struct QueryDenomTraceRequest {
+    #[prost(string, tag = "1")]
+    pub hash: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
+#[proto_message(type_url = "/ibc.applications.transfer.v1.QueryDenomTraceResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct QueryDenomTraceResponse {
+    #[prost(message, optional, tag = "1")]
+    pub denom_trace: ::core::option::Option<DenomTrace>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(
+    Clone,
+    PartialEq,
+    ::prost::Message,
+    schemars::JsonSchema,
+    serde::Serialize,
+    serde::Deserialize,
+    provwasm_proc_macro::CosmwasmExt,
+)]
 #[proto_message(type_url = "/ibc.applications.transfer.v1.MsgTransfer")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgTransfer {
@@ -52,3 +106,17 @@ pub struct MsgTransferResponse {
     )]
     pub sequence: u64,
 }
+pub struct TransferQuerier<'a, Q: cosmwasm_std::CustomQuery> {
+    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
+}
+impl<'a, Q: cosmwasm_std::CustomQuery> TransferQuerier<'a, Q> {
+    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
+        Self { querier }
+    }
+    pub fn denom_trace(
+        &self,
+        hash: ::prost::alloc::string::String,
+    ) -> std::result::Result<QueryDenomTraceResponse, cosmwasm_std::StdError> {
+        QueryDenomTraceRequest { hash }.query(self.querier)
+    }
+}

From 44680a9362a072ee230cd8e84c1371b7e2c4581f Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:05:04 -0600
Subject: [PATCH 40/64] remove empty queriers

---
 packages/provwasm-std/src/types/ibc/core/channel/v1.rs | 8 --------
 packages/provwasm-std/src/types/ibc/core/client/v1.rs  | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/packages/provwasm-std/src/types/ibc/core/channel/v1.rs b/packages/provwasm-std/src/types/ibc/core/channel/v1.rs
index 5a009335..3915413e 100644
--- a/packages/provwasm-std/src/types/ibc/core/channel/v1.rs
+++ b/packages/provwasm-std/src/types/ibc/core/channel/v1.rs
@@ -22,11 +22,3 @@ pub struct PacketId {
     )]
     pub sequence: u64,
 }
-pub struct ChannelQuerier<'a, Q: cosmwasm_std::CustomQuery> {
-    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
-}
-impl<'a, Q: cosmwasm_std::CustomQuery> ChannelQuerier<'a, Q> {
-    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
-        Self { querier }
-    }
-}
diff --git a/packages/provwasm-std/src/types/ibc/core/client/v1.rs b/packages/provwasm-std/src/types/ibc/core/client/v1.rs
index 95ac5070..7e0a9110 100644
--- a/packages/provwasm-std/src/types/ibc/core/client/v1.rs
+++ b/packages/provwasm-std/src/types/ibc/core/client/v1.rs
@@ -24,11 +24,3 @@ pub struct Height {
     )]
     pub revision_height: u64,
 }
-pub struct ClientQuerier<'a, Q: cosmwasm_std::CustomQuery> {
-    querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
-}
-impl<'a, Q: cosmwasm_std::CustomQuery> ClientQuerier<'a, Q> {
-    pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
-        Self { querier }
-    }
-}

From dc048835e36325e18d4702682ec3deb4012c4683 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:02:29 -0600
Subject: [PATCH 41/64] set 'cw-storage-plus' in workspace

---
 Cargo.lock | 30 +++++++++---------------------
 Cargo.toml |  2 +-
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 40e42432..4f23e284 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,7 +34,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "provwasm-mocks",
  "provwasm-std",
  "schemars",
@@ -227,16 +227,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cosmwasm-storage"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66de2ab9db04757bcedef2b5984fbe536903ada4a8a9766717a4a71197ef34f6"
-dependencies = [
- "cosmwasm-std",
- "serde",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.7"
@@ -743,7 +733,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "provwasm-std",
  "schemars",
  "serde",
@@ -755,7 +745,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "provwasm-std",
  "schemars",
  "serde",
@@ -892,7 +882,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "prost 0.11.9",
  "provwasm-mocks",
  "provwasm-std",
@@ -913,7 +903,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "provwasm-mocks",
  "provwasm-std",
  "schemars",
@@ -933,7 +923,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "jsonformat",
  "provwasm-mocks",
  "provwasm-std",
@@ -949,7 +939,6 @@ dependencies = [
  "bech32",
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
  "cw-multi-test 0.16.5",
  "cw-ownable",
  "cw-storage-plus",
@@ -1245,7 +1234,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "provwasm-std",
  "schemars",
  "serde",
@@ -1388,7 +1377,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "provwasm-mocks",
  "provwasm-std",
  "schemars",
@@ -1621,7 +1610,6 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
  "cw-multi-test 0.17.0",
  "cw-storage-plus",
  "cw-utils",
@@ -1669,7 +1657,7 @@ version = "2.2.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
+ "cw-storage-plus",
  "jsonformat",
  "provwasm-mocks",
  "provwasm-std",
diff --git a/Cargo.toml b/Cargo.toml
index bbae9d5b..669d5368 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ members = [
 ### CosmWasm
 cosmwasm-schema = { version = "1.2.5" }
 cosmwasm-std = { version = "1.2.5", default-features = false }
-cosmwasm-storage = { version = "1.2.5" }
+cw-storage-plus = { version = "1.2.0"}
 
 ### ProvWasm
 provwasm-proto-build = { version = "0.1.0", path = "packages/proto-build" }

From 7fa882ce0cba8a9cf64a519216e6b39d15117b32 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:04:45 -0600
Subject: [PATCH 42/64] update attrs contract for 'cw-storage-plus'

---
 contracts/attrs/Cargo.toml      |  2 +-
 contracts/attrs/src/contract.rs | 28 +++++++++++++++++-----------
 contracts/attrs/src/state.rs    | 15 +++------------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/contracts/attrs/Cargo.toml b/contracts/attrs/Cargo.toml
index 3b7f88fc..2330998e 100644
--- a/contracts/attrs/Cargo.toml
+++ b/contracts/attrs/Cargo.toml
@@ -18,7 +18,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true, default-features = false }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 provwasm-std = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }
diff --git a/contracts/attrs/src/contract.rs b/contracts/attrs/src/contract.rs
index 66370408..467b7f55 100644
--- a/contracts/attrs/src/contract.rs
+++ b/contracts/attrs/src/contract.rs
@@ -1,6 +1,7 @@
 use cosmwasm_std::{
-    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
+    Deps, DepsMut, entry_point, Env, MessageInfo, QueryResponse, Response, StdError, to_json_binary,
 };
+
 use provwasm_std::types::provenance::attribute::v1::{AttributeQuerier, AttributeType};
 
 use crate::error::ContractError;
@@ -11,7 +12,7 @@ use crate::helpers::{
 use crate::msg::{
     ExecuteMsg, InitMsg, Label, LabelNameResponse, LabelsResponse, MigrateMsg, QueryMsg,
 };
-use crate::state::{config, config_read, State};
+use crate::state::{CONFIG, State};
 
 /// Initialize the smart contract config state and bind a name to the contract address.
 #[entry_point]
@@ -22,10 +23,13 @@ pub fn instantiate(
     msg: InitMsg,
 ) -> Result<Response, ContractError> {
     // Create and save contract config state.
-    config(deps.storage).save(&State {
-        contract_owner: info.sender.clone(),
-        contract_name: msg.name.clone(),
-    })?;
+    CONFIG.save(
+        deps.storage,
+        &State {
+            contract_owner: info.sender.clone(),
+            contract_name: msg.name.clone(),
+        },
+    )?;
 
     // Create bind name message.
     let bind_name_msg = bind_name(
@@ -54,7 +58,7 @@ pub fn execute(
     msg: ExecuteMsg,
 ) -> Result<Response, ContractError> {
     // Load contract state
-    let state = config_read(deps.storage).load()?;
+    let state = CONFIG.load(deps.storage)?;
 
     // Validate the message sender is the contact owner.
     if info.sender != state.contract_owner {
@@ -177,7 +181,7 @@ fn try_update_label(
 /// Handle label query requests.
 #[entry_point]
 pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<QueryResponse, StdError> {
-    let state = config_read(deps.storage).load()?;
+    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 }),
@@ -198,9 +202,9 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response,
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use cosmwasm_std::testing::{mock_env, mock_info, MOCK_CONTRACT_ADDR};
-    use cosmwasm_std::{from_json, Binary, CosmosMsg};
+    use cosmwasm_std::{Binary, CosmosMsg, from_json};
+    use cosmwasm_std::testing::{MOCK_CONTRACT_ADDR, mock_env, mock_info};
+
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::attribute::v1::{
         Attribute, MsgAddAttributeRequest, MsgDeleteAttributeRequest, MsgUpdateAttributeRequest,
@@ -208,6 +212,8 @@ mod tests {
     };
     use provwasm_std::types::provenance::name::v1::{MsgBindNameRequest, NameRecord};
 
+    use super::*;
+
     #[test]
     fn init_test() {
         // Create default provenance mocks.
diff --git a/contracts/attrs/src/state.rs b/contracts/attrs/src/state.rs
index ee1975aa..3198e4b4 100644
--- a/contracts/attrs/src/state.rs
+++ b/contracts/attrs/src/state.rs
@@ -1,21 +1,12 @@
+use cosmwasm_std::Addr;
+use cw_storage_plus::Item;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::{Addr, Storage};
-use cosmwasm_storage::{singleton, singleton_read, ReadonlySingleton, Singleton};
-
-pub static CONFIG_KEY: &[u8] = b"config";
+pub const CONFIG: Item<State> = Item::new("config");
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
 pub struct State {
     pub contract_owner: Addr, // Ensures only sender from contract init can call handle.
     pub contract_name: String, // The root name of the contract.
 }
-
-pub fn config(storage: &mut dyn Storage) -> Singleton<State> {
-    singleton(storage, CONFIG_KEY)
-}
-
-pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
-    singleton_read(storage, CONFIG_KEY)
-}

From e223a1468c81cab8fb6f08ddb4d123308d5fa22c Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:07:15 -0600
Subject: [PATCH 43/64] update ibc contract for 'cw-storage-plus'

---
 contracts/ibc/local/Cargo.toml      |  2 +-
 contracts/ibc/local/src/contract.rs | 23 +++++++++++------------
 contracts/ibc/local/src/ibc.rs      | 12 ++++++------
 contracts/ibc/local/src/state.rs    | 29 ++++-------------------------
 contracts/ibc/remote/Cargo.toml     |  2 +-
 5 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/contracts/ibc/local/Cargo.toml b/contracts/ibc/local/Cargo.toml
index ff0cfe71..f70cb0ae 100644
--- a/contracts/ibc/local/Cargo.toml
+++ b/contracts/ibc/local/Cargo.toml
@@ -18,7 +18,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true, features = ["iterator", "staking", "stargate"] }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 provwasm-std = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }
diff --git a/contracts/ibc/local/src/contract.rs b/contracts/ibc/local/src/contract.rs
index 0815b42c..875d886c 100644
--- a/contracts/ibc/local/src/contract.rs
+++ b/contracts/ibc/local/src/contract.rs
@@ -9,7 +9,7 @@ use crate::msg::{
     AccountInfo, AccountResponse, AdminResponse, ExecuteMsg, InstantiateMsg, ListAccountsResponse,
     QueryMsg,
 };
-use crate::state::{accounts, accounts_read, config, config_read, Config};
+use crate::state::{Config, ACCOUNTS, CONFIG};
 
 #[entry_point]
 pub fn instantiate(
@@ -20,7 +20,7 @@ pub fn instantiate(
 ) -> StdResult<Response> {
     // we store the reflect_id for creating accounts later
     let cfg = Config { admin: info.sender };
-    config(deps.storage).save(&cfg)?;
+    CONFIG.save(deps.storage, &cfg)?;
 
     Ok(Response::new().add_attribute("action", "instantiate"))
 }
@@ -39,12 +39,12 @@ pub fn handle_update_admin(
     new_admin: String,
 ) -> StdResult<Response> {
     // auth check
-    let mut cfg = config(deps.storage).load()?;
+    let mut cfg = CONFIG.load(deps.storage)?;
     if info.sender != cfg.admin {
         return Err(StdError::generic_err("Only admin may set new admin"));
     }
     cfg.admin = deps.api.addr_validate(&new_admin)?;
-    config(deps.storage).save(&cfg)?;
+    CONFIG.save(deps.storage, &cfg)?;
 
     Ok(Response::new()
         .add_attribute("action", "handle_update_admin")
@@ -58,12 +58,12 @@ pub fn handle_who_am_i(
     channel_id: String,
 ) -> StdResult<Response> {
     // auth check
-    let cfg = config(deps.storage).load()?;
+    let cfg = CONFIG.load(deps.storage)?;
     if info.sender != cfg.admin {
         return Err(StdError::generic_err("Only admin may send messages"));
     }
     // ensure the channel exists (not found if not registered)
-    accounts(deps.storage).load(channel_id.as_bytes())?;
+    ACCOUNTS.load(deps.storage, &channel_id)?;
 
     // construct a packet to send
     let packet = PacketMsg::WhoAmI {};
@@ -89,16 +89,15 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
 }
 
 fn query_account(deps: Deps, channel_id: String) -> StdResult<AccountResponse> {
-    let account = accounts_read(deps.storage).load(channel_id.as_bytes())?;
+    let account = ACCOUNTS.load(deps.storage, &channel_id)?;
     Ok(account.into())
 }
 
 fn query_list_accounts(deps: Deps) -> StdResult<ListAccountsResponse> {
-    let accounts: StdResult<Vec<_>> = accounts_read(deps.storage)
-        .range(None, None, Order::Ascending)
+    let accounts: StdResult<Vec<_>> = ACCOUNTS
+        .range(deps.storage, None, None, Order::Ascending)
         .map(|r| {
-            let (k, account) = r?;
-            let channel_id = String::from_utf8(k)?;
+            let (channel_id, account) = r?;
             Ok(AccountInfo::convert(channel_id, account))
         })
         .collect();
@@ -108,7 +107,7 @@ fn query_list_accounts(deps: Deps) -> StdResult<ListAccountsResponse> {
 }
 
 fn query_admin(deps: Deps) -> StdResult<AdminResponse> {
-    let Config { admin } = config_read(deps.storage).load()?;
+    let Config { admin } = CONFIG.load(deps.storage)?;
     Ok(AdminResponse {
         admin: admin.into(),
     })
diff --git a/contracts/ibc/local/src/ibc.rs b/contracts/ibc/local/src/ibc.rs
index 577722c2..aadd01e3 100644
--- a/contracts/ibc/local/src/ibc.rs
+++ b/contracts/ibc/local/src/ibc.rs
@@ -5,7 +5,7 @@ use cosmwasm_std::{
 };
 
 use crate::ibc_msg::{AcknowledgementMsg, PacketMsg, WhoAmIResponse};
-use crate::state::{accounts, AccountData};
+use crate::state::{AccountData, ACCOUNTS};
 
 pub const IBC_APP_VERSION: &str = "pio-ibc-example-v1";
 pub const PACKET_LIFETIME: u64 = 60 * 60;
@@ -48,7 +48,7 @@ pub fn ibc_channel_connect(
 
     // create an account holder the channel exists (not found if not registered)
     let data = AccountData::default();
-    accounts(deps.storage).save(channel_id.as_bytes(), &data)?;
+    ACCOUNTS.save(deps.storage, channel_id, &data)?;
 
     // construct a packet to send
     let packet = PacketMsg::WhoAmI {};
@@ -75,7 +75,7 @@ pub fn ibc_channel_close(
 
     // remove the channel
     let channel_id = &channel.endpoint.channel_id;
-    accounts(deps.storage).remove(channel_id.as_bytes());
+    ACCOUNTS.remove(deps.storage, channel_id);
 
     Ok(IbcBasicResponse::new()
         .add_attribute("action", "ibc_channel_close")
@@ -131,7 +131,7 @@ fn acknowledge_who_am_i(
         }
     };
 
-    accounts(deps.storage).update(caller.as_bytes(), |acct| -> StdResult<_> {
+    ACCOUNTS.update(deps.storage, &caller, |acct| -> StdResult<_> {
         match acct {
             Some(mut acct) => {
                 // set the account the first time
@@ -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_json(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_json(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/local/src/state.rs b/contracts/ibc/local/src/state.rs
index f9bed38f..51602e4c 100644
--- a/contracts/ibc/local/src/state.rs
+++ b/contracts/ibc/local/src/state.rs
@@ -1,13 +1,9 @@
+use cosmwasm_std::{Addr, Coin, Timestamp};
+use cw_storage_plus::{Item, Map};
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::{Addr, Coin, Storage, Timestamp};
-use cosmwasm_storage::{
-    bucket, bucket_read, singleton, singleton_read, Bucket, ReadonlyBucket, ReadonlySingleton,
-    Singleton,
-};
-
-pub const KEY_CONFIG: &[u8] = b"config";
-pub const PREFIX_ACCOUNTS: &[u8] = b"accounts";
+pub const CONFIG: Item<Config> = Item::new("config");
+pub const ACCOUNTS: Map<&str, AccountData> = Map::new("accounts");
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 pub struct Config {
@@ -29,20 +25,3 @@ pub struct AccountData {
     pub time: Timestamp,
     pub chain_id: String,
 }
-
-/// accounts is lookup of channel_id to reflect contract
-pub fn accounts(storage: &mut dyn Storage) -> Bucket<AccountData> {
-    bucket(storage, PREFIX_ACCOUNTS)
-}
-
-pub fn accounts_read(storage: &dyn Storage) -> ReadonlyBucket<AccountData> {
-    bucket_read(storage, PREFIX_ACCOUNTS)
-}
-
-pub fn config(storage: &mut dyn Storage) -> Singleton<Config> {
-    singleton(storage, KEY_CONFIG)
-}
-
-pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<Config> {
-    singleton_read(storage, KEY_CONFIG)
-}
diff --git a/contracts/ibc/remote/Cargo.toml b/contracts/ibc/remote/Cargo.toml
index 7f000238..77ce26b4 100644
--- a/contracts/ibc/remote/Cargo.toml
+++ b/contracts/ibc/remote/Cargo.toml
@@ -18,7 +18,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true, features = ["ibc3", "iterator", "staking", "stargate"] }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 provwasm-std = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }

From 924fac9e2cf19e47f6ed82c62e828c4bbf645176 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:07:57 -0600
Subject: [PATCH 44/64] update marker contract for 'cw-storage-plus'

---
 contracts/marker/Cargo.toml      |  2 +-
 contracts/marker/src/contract.rs | 15 +++++++++++----
 contracts/marker/src/helpers.rs  |  2 ++
 contracts/marker/src/state.rs    | 14 ++------------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/contracts/marker/Cargo.toml b/contracts/marker/Cargo.toml
index 2bf43c32..109b5797 100644
--- a/contracts/marker/Cargo.toml
+++ b/contracts/marker/Cargo.toml
@@ -19,7 +19,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 provwasm-std = { workspace = true }
 schemars = {workspace = true}
 serde = { workspace = true, default-features = false, features = ["derive"] }
diff --git a/contracts/marker/src/contract.rs b/contracts/marker/src/contract.rs
index ab9b452f..3fabfd2e 100644
--- a/contracts/marker/src/contract.rs
+++ b/contracts/marker/src/contract.rs
@@ -12,7 +12,7 @@ use crate::helpers::{
     grant_marker_access, mint_marker_supply, transfer_marker_coins, withdraw_coins,
 };
 use crate::msg::{ExecuteMsg, InitMsg, QueryMsg};
-use crate::state::{config, State};
+use crate::state::{State, CONFIG};
 
 /// Initialize the smart contract config state, then bind a name to the contract address.
 #[entry_point]
@@ -23,9 +23,12 @@ pub fn instantiate(
     msg: InitMsg,
 ) -> Result<Response, ContractError> {
     // Create and save state
-    config(deps.storage).save(&State {
-        contract_name: msg.name.clone(),
-    })?;
+    CONFIG.save(
+        deps.storage,
+        &State {
+            contract_name: msg.name.clone(),
+        },
+    )?;
 
     // Create a name for the contract
     let bind_name_msg = bind_name(
@@ -322,6 +325,8 @@ mod tests {
             allow_governance_control: false,
             allow_forced_transfer: false,
             required_attributes: vec![],
+            usd_cents: 0,
+            volume: 0,
         }
         .try_into()
         .unwrap();
@@ -371,6 +376,8 @@ mod tests {
             allow_governance_control: false,
             allow_forced_transfer: true,
             required_attributes: vec![],
+            usd_cents: 0,
+            volume: 0,
         }
         .try_into()
         .unwrap();
diff --git a/contracts/marker/src/helpers.rs b/contracts/marker/src/helpers.rs
index 803acfbf..c7866e50 100644
--- a/contracts/marker/src/helpers.rs
+++ b/contracts/marker/src/helpers.rs
@@ -64,6 +64,8 @@ pub fn create_marker<S: Into<String>>(
         allow_governance_control: false,
         allow_forced_transfer,
         required_attributes: vec![],
+        usd_cents: 0,
+        volume: 0,
     }
     .into())
 }
diff --git a/contracts/marker/src/state.rs b/contracts/marker/src/state.rs
index 77cfd7d1..3decddd1 100644
--- a/contracts/marker/src/state.rs
+++ b/contracts/marker/src/state.rs
@@ -1,20 +1,10 @@
+use cw_storage_plus::Item;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::Storage;
-use cosmwasm_storage::{singleton, singleton_read, ReadonlySingleton, Singleton};
-
-pub static CONFIG_KEY: &[u8] = b"config";
+pub const CONFIG: Item<State> = Item::new("config");
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
 pub struct State {
     pub contract_name: String, // The root name of the contract.
 }
-
-pub fn config(storage: &mut dyn Storage) -> Singleton<State> {
-    singleton(storage, CONFIG_KEY)
-}
-
-pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
-    singleton_read(storage, CONFIG_KEY)
-}

From 31d319bac7bdd4b3fb64eed3ff3b3b76da863c1f Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:08:13 -0600
Subject: [PATCH 45/64] update msgfees contract for 'cw-storage-plus'

---
 contracts/msgfees/Cargo.toml      |  2 +-
 contracts/msgfees/src/contract.rs | 34 ++++++++++++++++++-------------
 contracts/msgfees/src/state.rs    | 15 +++-----------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/contracts/msgfees/Cargo.toml b/contracts/msgfees/Cargo.toml
index e745f467..71961c86 100644
--- a/contracts/msgfees/Cargo.toml
+++ b/contracts/msgfees/Cargo.toml
@@ -18,7 +18,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 provwasm-std = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }
diff --git a/contracts/msgfees/src/contract.rs b/contracts/msgfees/src/contract.rs
index e9234ca3..2eadf70b 100644
--- a/contracts/msgfees/src/contract.rs
+++ b/contracts/msgfees/src/contract.rs
@@ -4,7 +4,7 @@ use provwasm_std::types::cosmos::bank::v1beta1::MsgSend;
 use crate::error::ContractError;
 use crate::helpers::assess_custom_fee;
 use crate::msg::{ExecuteMsg, InitMsg};
-use crate::state::{config, config_read, State};
+use crate::state::{State, CONFIG};
 
 /// Initialize the smart contract config state and bind a name to the contract address.
 #[entry_point]
@@ -21,7 +21,7 @@ pub fn instantiate(
     };
 
     // Save contract config state.
-    config(deps.storage).save(&state)?;
+    CONFIG.save(deps.storage, &state)?;
 
     // Dispatch bind name message and add event attributes.
     let res = Response::new()
@@ -56,7 +56,7 @@ pub fn try_send_funds(
     to_address: Addr,
 ) -> Result<Response, ContractError> {
     // Load contract state
-    let state = config_read(deps.storage).load()?;
+    let state = CONFIG.load(deps.storage)?;
 
     // Dispatch message to handler and emit events
     let mut res = Response::new()
@@ -133,7 +133,7 @@ mod tests {
             ]
         );
         assert_eq!(
-            config_read(&deps.storage).load().unwrap(),
+            CONFIG.load(&deps.storage).unwrap(),
             State {
                 fee_amount: Some(coin(100_000, "nhash")),
                 fee_recipient: Some(Addr::unchecked("fee_address")),
@@ -148,11 +148,14 @@ mod tests {
         let env = mock_env();
         let info = mock_info("sender", &[coin(200_000, "nhash")]);
 
-        config(&mut deps.storage)
-            .save(&State {
-                fee_amount: Some(coin(100_000, "nhash")),
-                fee_recipient: Some(Addr::unchecked("fee_address")),
-            })
+        CONFIG
+            .save(
+                &mut deps.storage,
+                &State {
+                    fee_amount: Some(coin(100_000, "nhash")),
+                    fee_recipient: Some(Addr::unchecked("fee_address")),
+                },
+            )
             .expect("failed to save test state");
 
         let msg = ExecuteMsg::SendFunds {
@@ -214,11 +217,14 @@ mod tests {
         let env = mock_env();
         let info = mock_info("sender", &[]);
 
-        config(&mut deps.storage)
-            .save(&State {
-                fee_amount: None,
-                fee_recipient: None,
-            })
+        CONFIG
+            .save(
+                &mut deps.storage,
+                &State {
+                    fee_amount: None,
+                    fee_recipient: None,
+                },
+            )
             .expect("failed to save test state");
 
         let msg = ExecuteMsg::SendFunds {
diff --git a/contracts/msgfees/src/state.rs b/contracts/msgfees/src/state.rs
index a86e3572..367fd92a 100644
--- a/contracts/msgfees/src/state.rs
+++ b/contracts/msgfees/src/state.rs
@@ -1,21 +1,12 @@
+use cosmwasm_std::{Addr, Coin};
+use cw_storage_plus::Item;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::{Addr, Coin, Storage};
-use cosmwasm_storage::{singleton, singleton_read, ReadonlySingleton, Singleton};
-
-pub static CONFIG_KEY: &[u8] = b"config";
+pub const CONFIG: Item<State> = Item::new("config");
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
 pub struct State {
     pub(crate) fee_amount: Option<Coin>,
     pub(crate) fee_recipient: Option<Addr>,
 }
-
-pub fn config(storage: &mut dyn Storage) -> Singleton<State> {
-    singleton(storage, CONFIG_KEY)
-}
-
-pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
-    singleton_read(storage, CONFIG_KEY)
-}

From 90c02c31e873a8d97fad4ce6727834e64c10cf47 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:08:22 -0600
Subject: [PATCH 46/64] update name contract for 'cw-storage-plus'

---
 contracts/name/Cargo.toml      |  2 +-
 contracts/name/src/contract.rs |  8 ++++----
 contracts/name/src/state.rs    | 15 +++------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/contracts/name/Cargo.toml b/contracts/name/Cargo.toml
index 98b6c80e..aa870cc9 100644
--- a/contracts/name/Cargo.toml
+++ b/contracts/name/Cargo.toml
@@ -18,7 +18,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 jsonformat = "2.0.0"
 provwasm-std = { workspace = true }
 schemars = { workspace = true }
diff --git a/contracts/name/src/contract.rs b/contracts/name/src/contract.rs
index 0cba8f71..dfafcdc0 100644
--- a/contracts/name/src/contract.rs
+++ b/contracts/name/src/contract.rs
@@ -7,7 +7,7 @@ use provwasm_std::types::provenance::name::v1::{
 
 use crate::error::ContractError;
 use crate::msg::{ExecuteMsg, InitMsg, QueryMsg};
-use crate::state::{config, config_read, State};
+use crate::state::{State, CONFIG};
 
 /// Initialize the smart contract config state and bind a name to the contract address.
 #[entry_point]
@@ -24,7 +24,7 @@ pub fn instantiate(
     };
 
     // Save contract config state.
-    config(deps.storage).save(&state)?;
+    CONFIG.save(deps.storage, &state)?;
 
     let split: Vec<&str> = msg.name.splitn(2, '.').collect();
     let record = split.first();
@@ -83,7 +83,7 @@ pub fn try_bind_prefix(
     prefix: String,
 ) -> Result<Response, ContractError> {
     // Load contract state
-    let state = config_read(deps.storage).load()?;
+    let state = CONFIG.load(deps.storage)?;
 
     // Validate the message sender is the contact owner.
     if info.sender != state.contract_owner {
@@ -125,7 +125,7 @@ pub fn try_unbind_prefix(
     prefix: String,
 ) -> Result<Response, ContractError> {
     // Load contract state
-    let state = config_read(deps.storage).load()?;
+    let state = CONFIG.load(deps.storage)?;
 
     // Validate the message sender is the contact owner.
     if info.sender != state.contract_owner {
diff --git a/contracts/name/src/state.rs b/contracts/name/src/state.rs
index ee1975aa..3198e4b4 100644
--- a/contracts/name/src/state.rs
+++ b/contracts/name/src/state.rs
@@ -1,21 +1,12 @@
+use cosmwasm_std::Addr;
+use cw_storage_plus::Item;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::{Addr, Storage};
-use cosmwasm_storage::{singleton, singleton_read, ReadonlySingleton, Singleton};
-
-pub static CONFIG_KEY: &[u8] = b"config";
+pub const CONFIG: Item<State> = Item::new("config");
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
 pub struct State {
     pub contract_owner: Addr, // Ensures only sender from contract init can call handle.
     pub contract_name: String, // The root name of the contract.
 }
-
-pub fn config(storage: &mut dyn Storage) -> Singleton<State> {
-    singleton(storage, CONFIG_KEY)
-}
-
-pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
-    singleton_read(storage, CONFIG_KEY)
-}

From 86a0c21ce035fb38101539cac4474023c17a2ac7 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:09:34 -0600
Subject: [PATCH 47/64] fix nft contract compilation

---
 contracts/nft/Cargo.toml            |  3 +--
 contracts/nft/src/query/nft_info.rs | 10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/contracts/nft/Cargo.toml b/contracts/nft/Cargo.toml
index 5cca53da..02212c54 100644
--- a/contracts/nft/Cargo.toml
+++ b/contracts/nft/Cargo.toml
@@ -19,11 +19,10 @@ backtraces = []
 bech32 = "0.9.1"
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true, features = ["cosmwasm_1_1"] }
-cosmwasm-storage = { workspace = true }
 cw2 = "1.0.1"
 cw721 = "0.18.0"
 cw-ownable = "0.5.1"
-cw-storage-plus = { version = "1.1.0", features = ["iterator"] }
+cw-storage-plus = { workspace = true, features = ["iterator"] }
 cw-utils = "1.0.1"
 hex = { version = "0.4.3", default-features = false }
 provwasm-std = { workspace = true }
diff --git a/contracts/nft/src/query/nft_info.rs b/contracts/nft/src/query/nft_info.rs
index 5bb2d67f..08c5945f 100644
--- a/contracts/nft/src/query/nft_info.rs
+++ b/contracts/nft/src/query/nft_info.rs
@@ -20,5 +20,13 @@ pub fn handle(deps: Deps, _env: Env, token_id: String) -> Result<Binary, Contrac
 }
 
 pub fn load_scope(scope_id: String, querier: QuerierWrapper) -> Result<ScopeResponse, StdError> {
-    MetadataQuerier::new(&querier).scope(scope_id, "".to_string(), "".to_string(), true, true)
+    MetadataQuerier::new(&querier).scope(
+        scope_id,
+        "".to_string(),
+        "".to_string(),
+        true,
+        true,
+        false,
+        false,
+    )
 }

From ace8483013de13a6b322dd015199680aa40c6b1c Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:09:49 -0600
Subject: [PATCH 48/64] fix scope contract compilation

---
 contracts/scope/Cargo.toml      |  2 +-
 contracts/scope/src/contract.rs | 44 ++++++++++++++++++++++++++-------
 contracts/scope/src/state.rs    | 14 ++---------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/contracts/scope/Cargo.toml b/contracts/scope/Cargo.toml
index 6a258a60..8f2f993f 100644
--- a/contracts/scope/Cargo.toml
+++ b/contracts/scope/Cargo.toml
@@ -18,7 +18,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true, default-features = false }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 provwasm-std = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }
diff --git a/contracts/scope/src/contract.rs b/contracts/scope/src/contract.rs
index 0c1c5cbf..55f98631 100644
--- a/contracts/scope/src/contract.rs
+++ b/contracts/scope/src/contract.rs
@@ -1,12 +1,13 @@
 use cosmwasm_std::{
     entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
 };
+
 use provwasm_std::types::provenance::metadata::v1::{MetadataQuerier, MsgWriteScopeRequest, Scope};
 use provwasm_std::types::provenance::name::v1::{MsgBindNameRequest, NameRecord};
 
 use crate::error::ContractError;
 use crate::msg::{ExecuteMsg, InitMsg, QueryMsg};
-use crate::state::{config, State};
+use crate::state::{State, CONFIG};
 
 /// Initialize config state and bind a name to the contract address.
 #[entry_point]
@@ -17,9 +18,12 @@ pub fn instantiate(
     msg: InitMsg,
 ) -> Result<Response, ContractError> {
     // Create and save contract config state.
-    config(deps.storage).save(&State {
-        contract_name: msg.name.clone(),
-    })?;
+    CONFIG.save(
+        deps.storage,
+        &State {
+            contract_name: msg.name.clone(),
+        },
+    )?;
 
     let split: Vec<&str> = msg.name.splitn(2, '.').collect();
     let record = split.first();
@@ -100,14 +104,22 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, StdE
 // Use a ProvenanceQuerier to get a scope by ID.
 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)?;
+    let contract_spec_response = querier.contract_specification(id, true, false, false)?;
     to_json_binary(&contract_spec_response)
 }
 
 // Use a ProvenanceQuerier to get a scope by ID.
 fn try_get_scope(deps: Deps, id: String) -> Result<QueryResponse, StdError> {
     let querier = MetadataQuerier::new(&deps.querier);
-    let scope_response = querier.scope(id, "".to_string(), "".to_string(), false, false)?;
+    let scope_response = querier.scope(
+        id,
+        "".to_string(),
+        "".to_string(),
+        false,
+        false,
+        false,
+        false,
+    )?;
     to_json_binary(&scope_response)
 }
 
@@ -121,6 +133,8 @@ fn try_get_sessions(deps: Deps, scope_id: String) -> Result<QueryResponse, StdEr
         "".to_string(),
         false,
         false,
+        false,
+        false,
     )?;
     to_json_binary(&sessions_response)
 }
@@ -135,6 +149,8 @@ fn try_get_records(deps: Deps, scope_id: String) -> Result<QueryResponse, StdErr
         "".to_string(),
         false,
         false,
+        false,
+        false,
     )?;
     to_json_binary(&records_response)
 }
@@ -146,16 +162,24 @@ fn try_get_records_by_name(
     name: String,
 ) -> Result<QueryResponse, StdError> {
     let querier = MetadataQuerier::new(&deps.querier);
-    let records_response =
-        querier.records("".to_string(), scope_id, "".to_string(), name, false, false)?;
+    let records_response = querier.records(
+        "".to_string(),
+        scope_id,
+        "".to_string(),
+        name,
+        false,
+        false,
+        false,
+        false,
+    )?;
     to_json_binary(&records_response)
 }
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use cosmwasm_std::from_json;
     use cosmwasm_std::testing::{mock_env, mock_info};
+
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::metadata::v1::process::ProcessId;
     use provwasm_std::types::provenance::metadata::v1::record_input::Source;
@@ -165,6 +189,8 @@ mod tests {
         ScopeWrapper, Session, SessionWrapper, SessionsRequest, SessionsResponse,
     };
 
+    use super::*;
+
     #[test]
     fn valid_init() {
         // Create default provenance mocks.
diff --git a/contracts/scope/src/state.rs b/contracts/scope/src/state.rs
index 77cfd7d1..3decddd1 100644
--- a/contracts/scope/src/state.rs
+++ b/contracts/scope/src/state.rs
@@ -1,20 +1,10 @@
+use cw_storage_plus::Item;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::Storage;
-use cosmwasm_storage::{singleton, singleton_read, ReadonlySingleton, Singleton};
-
-pub static CONFIG_KEY: &[u8] = b"config";
+pub const CONFIG: Item<State> = Item::new("config");
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
 pub struct State {
     pub contract_name: String, // The root name of the contract.
 }
-
-pub fn config(storage: &mut dyn Storage) -> Singleton<State> {
-    singleton(storage, CONFIG_KEY)
-}
-
-pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
-    singleton_read(storage, CONFIG_KEY)
-}

From 9080d9eebe37a047e0ea4fc1bbda4bdc0ec6b515 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:09:59 -0600
Subject: [PATCH 49/64] fix template contract compilation

---
 contracts/template/Cargo.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contracts/template/Cargo.toml b/contracts/template/Cargo.toml
index 7acadb50..b2d9f9db 100644
--- a/contracts/template/Cargo.toml
+++ b/contracts/template/Cargo.toml
@@ -29,8 +29,7 @@ provwasm-std = { workspace = true }
 cw-utils = { version = "1.0.1" }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true, features = ["cosmwasm_1_1"] }
-cosmwasm-storage = { workspace = true }
-cw-storage-plus = { version = "1.0.1", features = ["iterator"] }
+cw-storage-plus = { workspace = true, features = ["iterator"] }
 cw2 = "1.0.1"
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }

From cf2c111d10b68e6e291613bc07d3c1bcd8d48947 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:10:06 -0600
Subject: [PATCH 50/64] fix trigger contract compilation

---
 contracts/trigger/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/trigger/Cargo.toml b/contracts/trigger/Cargo.toml
index d455ab87..c18518e6 100644
--- a/contracts/trigger/Cargo.toml
+++ b/contracts/trigger/Cargo.toml
@@ -18,7 +18,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 jsonformat = "2.0.0"
 provwasm-std = { workspace = true }
 schemars = { workspace = true }

From e07e756727d3ae8ae2b3960ffa32bc5f85619768 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:10:25 -0600
Subject: [PATCH 51/64] fix tutorial contract compilation

---
 contracts/tutorial/Cargo.toml      |  2 +-
 contracts/tutorial/src/contract.rs | 21 ++++++++++++---------
 contracts/tutorial/src/state.rs    | 15 +++------------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/contracts/tutorial/Cargo.toml b/contracts/tutorial/Cargo.toml
index 15c752b3..ab31c9dc 100644
--- a/contracts/tutorial/Cargo.toml
+++ b/contracts/tutorial/Cargo.toml
@@ -28,7 +28,7 @@ backtraces = []
 [dependencies]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true, default-features = false }
-cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
 provwasm-std = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }
diff --git a/contracts/tutorial/src/contract.rs b/contracts/tutorial/src/contract.rs
index 7e04091b..6adecdb9 100644
--- a/contracts/tutorial/src/contract.rs
+++ b/contracts/tutorial/src/contract.rs
@@ -7,7 +7,7 @@ use std::ops::Mul;
 
 use crate::error::ContractError;
 use crate::msg::{ExecuteMsg, InitMsg, MigrateMsg, QueryMsg};
-use crate::state::{config, config_read, State};
+use crate::state::{State, CONFIG};
 
 /// Initialize the contract
 #[entry_point]
@@ -40,12 +40,15 @@ pub fn instantiate(
     // Create and save contract config state. The fee collection address represents the network
     // (ie they get paid fees), thus they must be the message sender.
     let merchant_address = deps.api.addr_validate(&msg.merchant_address)?;
-    config(deps.storage).save(&State {
-        purchase_denom: msg.purchase_denom,
-        merchant_address,
-        fee_collection_address: info.sender,
-        fee_percent: msg.fee_percent,
-    })?;
+    CONFIG.save(
+        deps.storage,
+        &State {
+            purchase_denom: msg.purchase_denom,
+            merchant_address,
+            fee_collection_address: info.sender,
+            fee_percent: msg.fee_percent,
+        },
+    )?;
 
     // Create a message that will bind a restricted name to the contract address.
     let split: Vec<&str> = msg.contract_name.splitn(2, '.').collect();
@@ -89,7 +92,7 @@ pub fn query(
 ) -> StdResult<Binary> {
     match msg {
         QueryMsg::QueryRequest {} => {
-            let state = config_read(deps.storage).load()?;
+            let state = CONFIG.load(deps.storage)?;
             let json = to_json_binary(&state)?;
             Ok(json)
         }
@@ -130,7 +133,7 @@ fn try_purchase(
     }
 
     // Load state
-    let state = config_read(deps.storage).load()?;
+    let state = CONFIG.load(deps.storage)?;
     let fee_pct = state.fee_percent;
 
     // Ensure the funds have the required amount and denomination
diff --git a/contracts/tutorial/src/state.rs b/contracts/tutorial/src/state.rs
index 0883d08d..82b1ea2d 100644
--- a/contracts/tutorial/src/state.rs
+++ b/contracts/tutorial/src/state.rs
@@ -1,10 +1,9 @@
+use cosmwasm_std::{Addr, Decimal};
+use cw_storage_plus::Item;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::{Addr, Decimal, Storage};
-use cosmwasm_storage::{singleton, singleton_read, ReadonlySingleton, Singleton};
-
-pub static CONFIG_KEY: &[u8] = b"config";
+pub const CONFIG: Item<State> = Item::new("config");
 
 /// Fields that comprise the smart contract state
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
@@ -18,11 +17,3 @@ pub struct State {
     // The percentage to collect on transfers
     pub fee_percent: Decimal,
 }
-
-pub fn config(storage: &mut dyn Storage) -> Singleton<State> {
-    singleton(storage, CONFIG_KEY)
-}
-
-pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<State> {
-    singleton_read(storage, CONFIG_KEY)
-}

From 21110a9bf6e856e4fee6e4804f52d5ad61ef842b Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:18:32 -0600
Subject: [PATCH 52/64] format code

---
 contracts/attrs/src/contract.rs | 8 ++++----
 contracts/nft/src/core/error.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contracts/attrs/src/contract.rs b/contracts/attrs/src/contract.rs
index 467b7f55..9d39f17e 100644
--- a/contracts/attrs/src/contract.rs
+++ b/contracts/attrs/src/contract.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    Deps, DepsMut, entry_point, Env, MessageInfo, QueryResponse, Response, StdError, to_json_binary,
+    entry_point, to_json_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError,
 };
 
 use provwasm_std::types::provenance::attribute::v1::{AttributeQuerier, AttributeType};
@@ -12,7 +12,7 @@ use crate::helpers::{
 use crate::msg::{
     ExecuteMsg, InitMsg, Label, LabelNameResponse, LabelsResponse, MigrateMsg, QueryMsg,
 };
-use crate::state::{CONFIG, State};
+use crate::state::{State, CONFIG};
 
 /// Initialize the smart contract config state and bind a name to the contract address.
 #[entry_point]
@@ -202,8 +202,8 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response,
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::{Binary, CosmosMsg, from_json};
-    use cosmwasm_std::testing::{MOCK_CONTRACT_ADDR, mock_env, mock_info};
+    use cosmwasm_std::testing::{mock_env, mock_info, MOCK_CONTRACT_ADDR};
+    use cosmwasm_std::{from_json, Binary, CosmosMsg};
 
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::attribute::v1::{
diff --git a/contracts/nft/src/core/error.rs b/contracts/nft/src/core/error.rs
index cc43645f..37df3c81 100644
--- a/contracts/nft/src/core/error.rs
+++ b/contracts/nft/src/core/error.rs
@@ -17,7 +17,7 @@ pub enum ContractError {
 
     #[error("Funds present")]
     FundsPresent {},
-    
+
     #[error("Limit exceeds maximum of: {max_limit}")]
     MaxLimitExceeded { max_limit: u32 },
 

From 7a656abe36d5827b88272f5292b50f08f903a460 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:24:54 -0600
Subject: [PATCH 53/64] set cargo workspace metadata

---
 Cargo.toml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 669d5368..4b0221d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,11 +19,17 @@ members = [
     "contracts/tutorial"
 ]
 
+[workspace.package]
+version = "2.2.0"
+repository = "https://github.com/provenance-io/provwasm"
+edition = "2021"
+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"}
+cw-storage-plus = { version = "1.2.0" }
 
 ### ProvWasm
 provwasm-proto-build = { version = "0.1.0", path = "packages/proto-build" }

From c028c52c77c0d6c74feed64dda7fe9baf53a1cb7 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:25:37 -0600
Subject: [PATCH 54/64] set package projects to use workspace metadata

---
 packages/proto-build/Cargo.toml         | 5 +++--
 packages/provwasm-common/Cargo.toml     | 6 +++---
 packages/provwasm-mocks/Cargo.toml      | 8 ++++----
 packages/provwasm-proc-macro/Cargo.toml | 6 +++---
 packages/provwasm-std/Cargo.toml        | 8 ++++----
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/proto-build/Cargo.toml b/packages/proto-build/Cargo.toml
index d63553b1..c6681f1b 100644
--- a/packages/proto-build/Cargo.toml
+++ b/packages/proto-build/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "proto-build"
 version = "0.1.0"
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <ktalley@figure.com>"]
-edition = "2021"
-license = "Apache-2.0"
 publish = false
 
 [dependencies]
diff --git a/packages/provwasm-common/Cargo.toml b/packages/provwasm-common/Cargo.toml
index e7342813..9d314eed 100644
--- a/packages/provwasm-common/Cargo.toml
+++ b/packages/provwasm-common/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "provwasm-common"
 version = "0.1.0"
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <ktalley@figure.com>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/provenance-io/provwasm/tree/main/packages/provwasm-common"
 description = "Common library for ProvWasm internal"
 keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["cryptography::cryptocurrencies", "wasm"]
diff --git a/packages/provwasm-mocks/Cargo.toml b/packages/provwasm-mocks/Cargo.toml
index b743738c..6f48512c 100644
--- a/packages/provwasm-mocks/Cargo.toml
+++ b/packages/provwasm-mocks/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "provwasm-mocks"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/provenance-io/provwasm/tree/main/packages/provwasm-mocks"
 description = "Rust mocks that enable unit testing of CosmWasm smart contracts that interact with custom modules in the Provenance Blockchain"
 readme = "README.md"
 keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
diff --git a/packages/provwasm-proc-macro/Cargo.toml b/packages/provwasm-proc-macro/Cargo.toml
index 030d58db..f583096f 100644
--- a/packages/provwasm-proc-macro/Cargo.toml
+++ b/packages/provwasm-proc-macro/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "provwasm-proc-macro"
 version = "0.1.0"
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <ktalley@figure.com>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/provenance-io/provwasm/tree/main/packages/provwasm-proc-macro"
 description = "Rust macros that simplify query and response types for Provenance Blockchain smart contracts"
 keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["api-bindings", "cryptography::cryptocurrencies", "wasm"]
diff --git a/packages/provwasm-std/Cargo.toml b/packages/provwasm-std/Cargo.toml
index 39a12ec3..0ce699ff 100644
--- a/packages/provwasm-std/Cargo.toml
+++ b/packages/provwasm-std/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "provwasm-std"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <ktalley@figure.com>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/provenance-io/provwasm/tree/main/packages/provwasm-std"
 description = "Rust bindings that enable CosmWasm smart contracts to interact with custom modules in the Provenance Blockchain"
 keywords = ["provenance", "blockchain", "smart-contracts", "defi", "finance"]
 categories = ["api-bindings", "cryptography::cryptocurrencies", "wasm"]

From 56c327ef4bddee41ebed23f6efa7d0473c53a4c5 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:26:19 -0600
Subject: [PATCH 55/64] set contracts to use workspace metadata

---
 contracts/attrs/Cargo.toml      | 6 ++++--
 contracts/ibc/local/Cargo.toml  | 6 ++++--
 contracts/ibc/remote/Cargo.toml | 6 ++++--
 contracts/marker/Cargo.toml     | 6 ++++--
 contracts/msgfees/Cargo.toml    | 6 ++++--
 contracts/name/Cargo.toml       | 6 ++++--
 contracts/nft/Cargo.toml        | 6 ++++--
 contracts/scope/Cargo.toml      | 6 ++++--
 contracts/template/Cargo.toml   | 6 ++++--
 contracts/trigger/Cargo.toml    | 6 ++++--
 contracts/tutorial/Cargo.toml   | 8 ++++----
 11 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/contracts/attrs/Cargo.toml b/contracts/attrs/Cargo.toml
index 2330998e..6c4af085 100644
--- a/contracts/attrs/Cargo.toml
+++ b/contracts/attrs/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "attrs"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "attrs.wasm",
diff --git a/contracts/ibc/local/Cargo.toml b/contracts/ibc/local/Cargo.toml
index f70cb0ae..e5dd4223 100644
--- a/contracts/ibc/local/Cargo.toml
+++ b/contracts/ibc/local/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "ibc-local"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "ibc_local.wasm",
diff --git a/contracts/ibc/remote/Cargo.toml b/contracts/ibc/remote/Cargo.toml
index 77ce26b4..dd0e48c6 100644
--- a/contracts/ibc/remote/Cargo.toml
+++ b/contracts/ibc/remote/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "ibc-remote"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "ibc_remote.wasm",
diff --git a/contracts/marker/Cargo.toml b/contracts/marker/Cargo.toml
index 109b5797..41ed3055 100644
--- a/contracts/marker/Cargo.toml
+++ b/contracts/marker/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "marker"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Phil Story <pstory@figure.com>", "Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2018"
 
 exclude = [
   "marker.wasm",
diff --git a/contracts/msgfees/Cargo.toml b/contracts/msgfees/Cargo.toml
index 71961c86..28c0298a 100644
--- a/contracts/msgfees/Cargo.toml
+++ b/contracts/msgfees/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "msgfees"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "msgfees.wasm",
diff --git a/contracts/name/Cargo.toml b/contracts/name/Cargo.toml
index aa870cc9..7c18664b 100644
--- a/contracts/name/Cargo.toml
+++ b/contracts/name/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "name"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "name.wasm",
diff --git a/contracts/nft/Cargo.toml b/contracts/nft/Cargo.toml
index 02212c54..d503b770 100644
--- a/contracts/nft/Cargo.toml
+++ b/contracts/nft/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "nft"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "nft.wasm",
diff --git a/contracts/scope/Cargo.toml b/contracts/scope/Cargo.toml
index 8f2f993f..2ff90786 100644
--- a/contracts/scope/Cargo.toml
+++ b/contracts/scope/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "scope"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "scope.wasm",
diff --git a/contracts/template/Cargo.toml b/contracts/template/Cargo.toml
index b2d9f9db..398cf24a 100644
--- a/contracts/template/Cargo.toml
+++ b/contracts/template/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "template"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Matthew Witkowski <mwitkowski@provenance.io"]
-edition = "2021"
 
 exclude = ["contract.wasm", "checksums.txt"]
 
diff --git a/contracts/trigger/Cargo.toml b/contracts/trigger/Cargo.toml
index c18518e6..be51b0c6 100644
--- a/contracts/trigger/Cargo.toml
+++ b/contracts/trigger/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "trigger"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["Ken Talley <4344285+kwtalley@users.noreply.github.com"]
-edition = "2021"
 
 exclude = [
     "trigger.wasm",
diff --git a/contracts/tutorial/Cargo.toml b/contracts/tutorial/Cargo.toml
index ab31c9dc..bb82c0e6 100644
--- a/contracts/tutorial/Cargo.toml
+++ b/contracts/tutorial/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "provwasm-tutorial"
-version = "2.2.0"
+version = { workspace = true }
+repository = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
 authors = ["fkneeland <fkneeland@figure.com>"]
-edition = "2021"
-license = "Apache-2.0"
-repository = "https://github.com/provenance-io/fkneeland-figure/smart-contract-tutorial"
 description = "A simple smart contract used for testing inside of the Provenance blockchain"
 
 exclude = [

From c56d944832856cc1ece65e939e13366dc3f920f4 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:28:49 -0600
Subject: [PATCH 56/64] add arm64 check for contract makefiles optimize target

---
 contracts/attrs/Makefile      | 11 +++++++++--
 contracts/ibc/local/Makefile  | 11 +++++++++--
 contracts/ibc/remote/Makefile | 11 +++++++++--
 contracts/marker/Makefile     | 11 +++++++++--
 contracts/msgfees/Makefile    | 11 +++++++++--
 contracts/name/Makefile       | 11 +++++++++--
 contracts/nft/Makefile        | 11 +++++++++--
 contracts/scope/Makefile      | 11 +++++++++--
 contracts/template/Makefile   | 18 ++++++++----------
 contracts/trigger/Makefile    | 11 +++++++++--
 contracts/tutorial/Makefile   | 11 +++++++++--
 11 files changed, 98 insertions(+), 30 deletions(-)

diff --git a/contracts/attrs/Makefile b/contracts/attrs/Makefile
index 2c799b7d..61143ef6 100644
--- a/contracts/attrs/Makefile
+++ b/contracts/attrs/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/attrs \
 		--mount type=volume,source=attrs_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/ibc/local/Makefile b/contracts/ibc/local/Makefile
index c848b634..f72d1186 100644
--- a/contracts/ibc/local/Makefile
+++ b/contracts/ibc/local/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../../:/code:Z --workdir /code/contracts/ibc/local \
 		--mount type=volume,source=ibc_local_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/ibc/remote/Makefile b/contracts/ibc/remote/Makefile
index 6bc27b95..45594c54 100644
--- a/contracts/ibc/remote/Makefile
+++ b/contracts/ibc/remote/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../../:/code:Z --workdir /code/contracts/ibc/remote \
 		--mount type=volume,source=ibc_remote_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/marker/Makefile b/contracts/marker/Makefile
index 7191ef48..61ae11a4 100644
--- a/contracts/marker/Makefile
+++ b/contracts/marker/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/marker \
 		--mount type=volume,source=marker_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/msgfees/Makefile b/contracts/msgfees/Makefile
index eb93ffcd..97c81cee 100644
--- a/contracts/msgfees/Makefile
+++ b/contracts/msgfees/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/msgfees \
 		--mount type=volume,source=msgfees_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/name/Makefile b/contracts/name/Makefile
index 6663a33d..3ab30071 100644
--- a/contracts/name/Makefile
+++ b/contracts/name/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/name \
 		--mount type=volume,source=name_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/nft/Makefile b/contracts/nft/Makefile
index a99bc30d..72af1704 100644
--- a/contracts/nft/Makefile
+++ b/contracts/nft/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/nft \
 		--mount type=volume,source=nft_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/scope/Makefile b/contracts/scope/Makefile
index 66e09084..f5afb162 100644
--- a/contracts/scope/Makefile
+++ b/contracts/scope/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/scope \
 		--mount type=volume,source=scope_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/template/Makefile b/contracts/template/Makefile
index 122e22d6..f60b243a 100644
--- a/contracts/template/Makefile
+++ b/contracts/template/Makefile
@@ -25,14 +25,12 @@ schema:
 
 .PHONY: optimize
 optimize:
-ifeq ($(UNAME_M),arm64)
-	@docker run --rm -v $(CURDIR):/code \
-		--mount type=volume,source="exchange_cache",target=/code/target \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/template \
+		--mount type=volume,source=template_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer-arm64:0.14.0
-else
-	@docker run --rm -v $(CURDIR):/code \
-		--mount type=volume,source="exchange_cache",target=/code/target \
-		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.14.0
-endif
\ No newline at end of file
+		$$image:0.15.0
\ No newline at end of file
diff --git a/contracts/trigger/Makefile b/contracts/trigger/Makefile
index 02f2a202..93b73816 100644
--- a/contracts/trigger/Makefile
+++ b/contracts/trigger/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all
 all: fmt build test lint schema optimize
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -32,10 +34,15 @@ check:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/trigger \
 		--mount type=volume,source=trigger_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0
 
 .PHONY: install
 install:
diff --git a/contracts/tutorial/Makefile b/contracts/tutorial/Makefile
index d6903adf..5d648a4f 100644
--- a/contracts/tutorial/Makefile
+++ b/contracts/tutorial/Makefile
@@ -4,6 +4,8 @@ all: fmt build test lint schema optimize
 .PHONY: pre-optimize
 pre-optimize: fmt build test lint schema
 
+UNAME_M := $(shell uname -m)
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all -- --check
@@ -31,7 +33,12 @@ clean:
 
 .PHONY: optimize
 optimize:
-	@docker run --rm -v $(CURDIR):/code:Z -v "$(CURDIR)/../../packages":/packages:Z \
+	@if [ "$(UNAME_M)" = "arm64" ]; then \
+		image="cosmwasm/optimizer-arm64"; \
+	else \
+		image="cosmwasm/optimizer"; \
+	fi; \
+	docker run --rm -v $(CURDIR)/../../:/code:Z --workdir /code/contracts/tutorial \
 		--mount type=volume,source=tutorial_cache,target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.10
+		$$image:0.15.0

From 3b1838724a0c6acf1df241bde330c48bc058f3b5 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:29:19 -0600
Subject: [PATCH 57/64] update contracts json schemas

---
 Makefile                                      | 24 +++---
 contracts/README.md                           |  9 ++-
 contracts/attrs/schema/attrs.json             |  2 +-
 contracts/ibc/local/schema/ibc-local.json     |  2 +-
 contracts/ibc/remote/schema/ibc-remote.json   |  2 +-
 contracts/msgfees/schema/msgfees.json         |  2 +-
 contracts/name/schema/name.json               |  2 +-
 contracts/nft/schema/execute_msg.json         | 12 +--
 contracts/scope/schema/scope.json             | 77 ++++++++++++++++++-
 contracts/trigger/schema/trigger.json         |  2 +-
 .../tutorial/schema/provwasm-tutorial.json    |  2 +-
 11 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index cde28fb8..0324bbca 100644
--- a/Makefile
+++ b/Makefile
@@ -42,15 +42,15 @@ name:
 scope:
 	@make -C contracts/scope
 
-.PHONY: optimize-contracts
-test-attrs: attrs
-	if [[ $(arch) == "arm64" ]]; then
-	  image="cosmwasm/workspace-optimizer-arm64"
-	else
-	  image="cosmwasm/workspace-optimizer"
-	fi
-
-	docker run --rm -v "$(pwd)":/code:Z \
-	  --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
-	  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-	  ${image}:0.12.13
+#.PHONY: optimize-contracts
+#test-attrs: attrs
+#	if [[ $(arch) == "arm64" ]]; then
+#	  image="cosmwasm/optimizer-arm64"
+#	else
+#	  image="cosmwasm/optimizer"
+#	fi
+#
+#	docker run --rm -v "$(pwd)":/code:Z \
+#	  --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
+#	  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+#	  ${image}:0.15.0
diff --git a/contracts/README.md b/contracts/README.md
index dfbf35ba..c888d5f7 100644
--- a/contracts/README.md
+++ b/contracts/README.md
@@ -6,6 +6,11 @@ Rust bindings.
 ## Listing
 
 - [Attributes](attrs/README.md) - manage account attributes.
-- [Markers](marker/README.md) - manage marker accounts.
-- [Names](name/README.md) - bind names to addresses.
+- [IBC](ibc/README.md) - ibc contracts for local and remote chains.
+- [Marker](marker/README.md) - manage marker accounts.
+- [Msg Fees](msgfees/README.md) - apply msg fees to tx.
+- [Name](name/README.md) - bind names to addresses.
+- [NFT](nft/README.md) - CW721 NFT contract utilizing the metadata module.
 - [Metadata](scope/README.md) - manage metadata and scopes.
+- [Template](template/README.md) - example contract that serves as a template.
+- [Tutorial](tutorial/README.md) - complete contract created from the tutorial.
diff --git a/contracts/attrs/schema/attrs.json b/contracts/attrs/schema/attrs.json
index c990495e..bb9f4424 100644
--- a/contracts/attrs/schema/attrs.json
+++ b/contracts/attrs/schema/attrs.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "attrs",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/ibc/local/schema/ibc-local.json b/contracts/ibc/local/schema/ibc-local.json
index f8acbeab..85b433d6 100644
--- a/contracts/ibc/local/schema/ibc-local.json
+++ b/contracts/ibc/local/schema/ibc-local.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "ibc-local",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/ibc/remote/schema/ibc-remote.json b/contracts/ibc/remote/schema/ibc-remote.json
index ce854dbf..77b174a8 100644
--- a/contracts/ibc/remote/schema/ibc-remote.json
+++ b/contracts/ibc/remote/schema/ibc-remote.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "ibc-remote",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/msgfees/schema/msgfees.json b/contracts/msgfees/schema/msgfees.json
index 9e3ffb2e..ee309a48 100644
--- a/contracts/msgfees/schema/msgfees.json
+++ b/contracts/msgfees/schema/msgfees.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "msgfees",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/name/schema/name.json b/contracts/name/schema/name.json
index 03043c0c..d5afed72 100644
--- a/contracts/name/schema/name.json
+++ b/contracts/name/schema/name.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "name",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/nft/schema/execute_msg.json b/contracts/nft/schema/execute_msg.json
index a0239b12..6aa4cd54 100644
--- a/contracts/nft/schema/execute_msg.json
+++ b/contracts/nft/schema/execute_msg.json
@@ -118,8 +118,8 @@
           "type": "object",
           "required": [
             "recipient",
-            "scope_uuid",
-            "session_uuid"
+            "session_uuid",
+            "token_id"
           ],
           "properties": {
             "recipient": {
@@ -130,13 +130,13 @@
                 }
               ]
             },
-            "scope_uuid": {
-              "description": "Generated UUID to use for creating the NFT (Scope)",
-              "type": "string"
-            },
             "session_uuid": {
               "description": "Generated UUID to use for creating the Session which encapsulates an owner data record",
               "type": "string"
+            },
+            "token_id": {
+              "description": "Generated UUID to use for creating the NFT (Scope)",
+              "type": "string"
             }
           },
           "additionalProperties": false
diff --git a/contracts/scope/schema/scope.json b/contracts/scope/schema/scope.json
index 13e40ee8..2567a768 100644
--- a/contracts/scope/schema/scope.json
+++ b/contracts/scope/schema/scope.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "scope",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -373,13 +373,21 @@
         "ContractSpecificationRequest": {
           "type": "object",
           "required": [
+            "exclude_id_info",
             "include_record_specs",
+            "include_request",
             "specification_id"
           ],
           "properties": {
+            "exclude_id_info": {
+              "type": "boolean"
+            },
             "include_record_specs": {
               "type": "boolean"
             },
+            "include_request": {
+              "type": "boolean"
+            },
             "specification_id": {
               "type": "string"
             }
@@ -446,7 +454,7 @@
             "source": {
               "anyOf": [
                 {
-                  "$ref": "#/definitions/Source"
+                  "$ref": "#/definitions/Source2"
                 },
                 {
                   "type": "null"
@@ -616,6 +624,39 @@
               "additionalProperties": false
             }
           ]
+        },
+        "Source2": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "record_id"
+              ],
+              "properties": {
+                "record_id": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer",
+                    "format": "uint8",
+                    "minimum": 0.0
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "hash"
+              ],
+              "properties": {
+                "hash": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
         }
       }
     },
@@ -1073,6 +1114,8 @@
         "RecordsRequest": {
           "type": "object",
           "required": [
+            "exclude_id_info",
+            "include_request",
             "include_scope",
             "include_sessions",
             "name",
@@ -1081,6 +1124,12 @@
             "session_id"
           ],
           "properties": {
+            "exclude_id_info": {
+              "type": "boolean"
+            },
+            "include_request": {
+              "type": "boolean"
+            },
             "include_scope": {
               "type": "boolean"
             },
@@ -1891,6 +1940,8 @@
         "RecordsRequest": {
           "type": "object",
           "required": [
+            "exclude_id_info",
+            "include_request",
             "include_scope",
             "include_sessions",
             "name",
@@ -1899,6 +1950,12 @@
             "session_id"
           ],
           "properties": {
+            "exclude_id_info": {
+              "type": "boolean"
+            },
+            "include_request": {
+              "type": "boolean"
+            },
             "include_scope": {
               "type": "boolean"
             },
@@ -2874,16 +2931,24 @@
         "ScopeRequest": {
           "type": "object",
           "required": [
+            "exclude_id_info",
             "include_records",
+            "include_request",
             "include_sessions",
             "record_addr",
             "scope_id",
             "session_addr"
           ],
           "properties": {
+            "exclude_id_info": {
+              "type": "boolean"
+            },
             "include_records": {
               "type": "boolean"
             },
+            "include_request": {
+              "type": "boolean"
+            },
             "include_sessions": {
               "type": "boolean"
             },
@@ -3951,7 +4016,9 @@
         "SessionsRequest": {
           "type": "object",
           "required": [
+            "exclude_id_info",
             "include_records",
+            "include_request",
             "include_scope",
             "record_addr",
             "record_name",
@@ -3959,9 +4026,15 @@
             "session_id"
           ],
           "properties": {
+            "exclude_id_info": {
+              "type": "boolean"
+            },
             "include_records": {
               "type": "boolean"
             },
+            "include_request": {
+              "type": "boolean"
+            },
             "include_scope": {
               "type": "boolean"
             },
diff --git a/contracts/trigger/schema/trigger.json b/contracts/trigger/schema/trigger.json
index 63872b98..78e69690 100644
--- a/contracts/trigger/schema/trigger.json
+++ b/contracts/trigger/schema/trigger.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "trigger",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/tutorial/schema/provwasm-tutorial.json b/contracts/tutorial/schema/provwasm-tutorial.json
index 49af4334..9e6b9806 100644
--- a/contracts/tutorial/schema/provwasm-tutorial.json
+++ b/contracts/tutorial/schema/provwasm-tutorial.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "provwasm-tutorial",
-  "contract_version": "2.1.0",
+  "contract_version": "2.2.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

From f8eb4a79ce7ecddda95ffe007a9b9e7622bc4e97 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:49:40 -0600
Subject: [PATCH 58/64] fix test workflow provenance version

---
 .github/workflows/test.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f2ffe38b..42587da0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.0-rc1"
+          provenance_version: "v1.17.1"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/tutorial_test.sh"
 
@@ -56,7 +56,7 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.0-rc1"
+          provenance_version: "v1.17.1"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/attrs_test.sh"
 
@@ -77,7 +77,7 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.0-rc1"
+          provenance_version: "v1.17.1"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/marker_test.sh"
 
@@ -98,7 +98,7 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.0-rc1"
+          provenance_version: "v1.17.1"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/msgfees_test.sh"
 
@@ -119,7 +119,7 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.0-rc1"
+          provenance_version: "v1.17.1"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/name_test.sh"
 
@@ -140,7 +140,7 @@ jobs:
 #        uses: provenance-io/provenance-testing-action@v1.2.0
 #        with:
 #          github_token: ${{ secrets.GITHUB_TOKEN }}
-#          provenance_version: "v1.17.0-rc1"
+#          provenance_version: "v1.17.1"
 #          smart_contract_action_version: "v1.2.0"
 #          test_script: "./scripts/gh-action-test/nft_test.sh"
 
@@ -161,7 +161,7 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.0-rc1"
+          provenance_version: "v1.17.1"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/scope_test.sh"
 
@@ -182,6 +182,6 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.0-rc1"
+          provenance_version: "v1.17.1"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/trigger_test.sh"

From a3f5191682e1e44eea51ac7692f4efe52ad725c3 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:27:04 -0600
Subject: [PATCH 59/64] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79d58e16..e8383708 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## Unreleased changes
 
 * Add wasm message types ([#133](https://github.com/provenance-io/provwasm/issues/133))
+* Bump to Provenance 1.17.1 ([#135](https://github.com/provenance-io/provwasm/issues/135))
+* Add ibc message types ([#136](https://github.com/provenance-io/provwasm/issues/136))
 
 ## Releases
 

From 12548670b8ee9425202470e08b72009b5589a0ee Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:27:13 -0600
Subject: [PATCH 60/64] update RELEASE_CHANGELOG

---
 RELEASE_CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/RELEASE_CHANGELOG.md b/RELEASE_CHANGELOG.md
index 57aba577..8ae1a869 100644
--- a/RELEASE_CHANGELOG.md
+++ b/RELEASE_CHANGELOG.md
@@ -1,4 +1,5 @@
-### [v2.1.0](https://github.com/provenance-io/provwasm/tree/v2.1.0)
+### [v2.2.0](https://github.com/provenance-io/provwasm/tree/v2.2.0)
 
-* Add trigger module message types ([#120](https://github.com/provenance-io/provwasm/issues/120))
-* Add exchange module message types ([#127](https://github.com/provenance-io/provwasm/issues/127))
\ No newline at end of file
+* Add wasm message types ([#133](https://github.com/provenance-io/provwasm/issues/133))
+* Bump to Provenance 1.17.1 ([#135](https://github.com/provenance-io/provwasm/issues/135))
+* Add ibc message types ([#136](https://github.com/provenance-io/provwasm/issues/136))

From 4e50adfcb252ff35e6deb5533c1b3689661eae17 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 7 Feb 2024 22:18:45 -0600
Subject: [PATCH 61/64] update CHANGELOG, RELEASE_CHANGELOG

---
 CHANGELOG.md         | 1 +
 RELEASE_CHANGELOG.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8383708..34dd30e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Add wasm message types ([#133](https://github.com/provenance-io/provwasm/issues/133))
 * Bump to Provenance 1.17.1 ([#135](https://github.com/provenance-io/provwasm/issues/135))
 * Add ibc message types ([#136](https://github.com/provenance-io/provwasm/issues/136))
+* Update contracts to use `cosmwasm/optimzer` ([#140](https://github.com/provenance-io/provwasm/issues/140))
 
 ## Releases
 
diff --git a/RELEASE_CHANGELOG.md b/RELEASE_CHANGELOG.md
index 8ae1a869..560c20f9 100644
--- a/RELEASE_CHANGELOG.md
+++ b/RELEASE_CHANGELOG.md
@@ -3,3 +3,4 @@
 * Add wasm message types ([#133](https://github.com/provenance-io/provwasm/issues/133))
 * Bump to Provenance 1.17.1 ([#135](https://github.com/provenance-io/provwasm/issues/135))
 * Add ibc message types ([#136](https://github.com/provenance-io/provwasm/issues/136))
+* Update contracts to use `cosmwasm/optimzer` ([#140](https://github.com/provenance-io/provwasm/issues/140))

From 94da5bf7508fd9408ed04ce7a4a628c648cc8372 Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Wed, 7 Feb 2024 22:20:52 -0600
Subject: [PATCH 62/64] cleanup and add targets to root Makefile

---
 Makefile | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 0324bbca..fe3bcacf 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,10 @@ optimize-tutorial:
 attrs:
 	@make -C contracts/attrs
 
+.PHONY: ibc
+attrs:
+	@make -C contracts/ibc
+
 .PHONY: marker
 marker:
 	@make -C contracts/marker
@@ -38,19 +42,18 @@ msgfees:
 name:
 	@make -C contracts/name
 
+.PHONY: nft
+name:
+	@make -C contracts/nft
+
 .PHONY: scope
 scope:
 	@make -C contracts/scope
 
-#.PHONY: optimize-contracts
-#test-attrs: attrs
-#	if [[ $(arch) == "arm64" ]]; then
-#	  image="cosmwasm/optimizer-arm64"
-#	else
-#	  image="cosmwasm/optimizer"
-#	fi
-#
-#	docker run --rm -v "$(pwd)":/code:Z \
-#	  --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
-#	  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-#	  ${image}:0.15.0
+.PHONY: template
+scope:
+	@make -C contracts/template
+
+.PHONY: trigger
+scope:
+	@make -C contracts/trigger

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 63/64] 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)

From 4e924ddbb42e2c11d939eb4262491aa36861a40f Mon Sep 17 00:00:00 2001
From: kwt <4344285+kwtalley@users.noreply.github.com>
Date: Fri, 9 Feb 2024 23:17:00 -0600
Subject: [PATCH 64/64] fix template contract

---
 contracts/template/Cargo.lock | 187 ++++++++++++++--------------------
 contracts/template/Cargo.toml |  24 ++---
 2 files changed, 85 insertions(+), 126 deletions(-)

diff --git a/contracts/template/Cargo.lock b/contracts/template/Cargo.lock
index 577e830b..48cc8ee6 100644
--- a/contracts/template/Cargo.lock
+++ b/contracts/template/Cargo.lock
@@ -31,6 +31,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.4"
@@ -61,12 +67,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "bnum"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128a44527fc0d6abf05f9eda748b9027536e12dff93f5acc8449f51583309350"
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -124,9 +124,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema"
-version = "1.4.1"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef683a9c1c4eabd6d31515719d0d2cc66952c4c87f7eb192bfc90384517dc34"
+checksum = "0f00b363610218eea83f24bbab09e1a7c3920b79f068334fdfcc62f6129ef9fc"
 dependencies = [
  "cosmwasm-schema-derive",
  "schemars",
@@ -137,9 +137,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "1.4.1"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9567025acbb4c0c008178393eb53b3ac3c2e492c25949d3bf415b9cbe80772d8"
+checksum = "ae38f909b2822d32b275c9e2db9728497aa33ffe67dd463bc67c6a3b7092785c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -148,12 +148,11 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-std"
-version = "1.4.1"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d89d680fb60439b7c5947b15f9c84b961b88d1f8a3b20c4bd178a3f87db8bae"
+checksum = "a49b85345e811c8e80ec55d0d091e4fcb4f00f97ab058f9be5f614c444a730cb"
 dependencies = [
- "base64",
- "bnum",
+ "base64 0.13.1",
  "cosmwasm-crypto",
  "cosmwasm-derive",
  "derivative",
@@ -164,16 +163,7 @@ dependencies = [
  "serde-json-wasm",
  "sha2 0.10.8",
  "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-storage"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a1c574d30feffe4b8121e61e839c231a5ce21901221d2fb4d5c945968a4f00"
-dependencies = [
- "cosmwasm-std",
- "serde",
+ "uint",
 ]
 
 [[package]]
@@ -185,6 +175,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.5.3"
@@ -220,25 +216,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[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.1",
- "schemars",
- "serde",
- "sha2 0.10.8",
- "thiserror",
-]
-
 [[package]]
 name = "cw-storage-plus"
 version = "1.1.0"
@@ -252,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "cw-utils"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9f351a4e4d81ef7c890e44d903f8c0bdcdc00f094fd3a181eaf70c0eec7a3a"
+checksum = "c80e93d1deccb8588db03945016a292c3c631e6325d349ebb35d2db6f4f946f7"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -267,9 +244,9 @@ dependencies = [
 
 [[package]]
 name = "cw2"
-version = "1.1.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9431d14f64f49e41c6ef5561ed11a5391c417d0cb16455dea8cdcb9037a8d197"
+checksum = "29ac2dc7a55ad64173ca1e0a46697c31b7a5c51342f55a1e84a724da4eb99908"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -469,15 +446,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -537,9 +505,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -551,17 +519,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
  "bytes",
- "prost-derive 0.11.9",
-]
-
-[[package]]
-name = "prost"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
-dependencies = [
- "bytes",
- "prost-derive 0.12.1",
+ "prost-derive",
 ]
 
 [[package]]
@@ -571,32 +529,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "prost-derive"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
-dependencies = [
- "anyhow",
- "itertools 0.11.0",
- "proc-macro2",
- "quote",
- "syn 2.0.38",
-]
-
 [[package]]
 name = "prost-types"
 version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
 dependencies = [
- "prost 0.11.9",
+ "prost",
 ]
 
 [[package]]
@@ -610,9 +555,9 @@ dependencies = [
 
 [[package]]
 name = "provwasm-mocks"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02175727ba6205cb5feac4724d3ab6f4e5833dddae517961bf820f6df4d3a6bd"
+checksum = "e1143b9d41f537559d30a3cbbcbaa3a196f829fc298daaa4bbacd5ca90309950"
 dependencies = [
  "cosmwasm-std",
  "provwasm-common",
@@ -627,10 +572,10 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "792736fb76e0acb3118b22e5e55e456b22c67ac3ee51bfb1f7dfde09bd954560"
 dependencies = [
- "itertools 0.10.5",
+ "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -639,11 +584,11 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc1be9fcaa463174e3bec59a179ed5b3590aa038f0e9c68d5132bc19df212383"
 dependencies = [
- "base64",
+ "base64 0.21.4",
  "chrono",
  "cosmwasm-schema",
  "cosmwasm-std",
- "prost 0.11.9",
+ "prost",
  "prost-types",
  "provwasm-common",
  "provwasm-proc-macro",
@@ -655,9 +600,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -701,9 +646,9 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "schemars"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
+checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -713,9 +658,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
+checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -739,15 +684,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
@@ -772,13 +717,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -847,6 +792,12 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "strum_macros"
 version = "0.24.3"
@@ -879,9 +830,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -890,12 +841,10 @@ dependencies = [
 
 [[package]]
 name = "template"
-version = "2.2.0"
+version = "2.1.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cosmwasm-storage",
- "cw-multi-test",
  "cw-storage-plus",
  "cw-utils",
  "cw2",
@@ -909,22 +858,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -933,6 +882,18 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
+[[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.12"
diff --git a/contracts/template/Cargo.toml b/contracts/template/Cargo.toml
index 1332be99..f2f5f322 100644
--- a/contracts/template/Cargo.toml
+++ b/contracts/template/Cargo.toml
@@ -36,18 +36,16 @@ optimize-arm = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-provwasm-std = { version = "2.1.0" }
-cw-utils = { version = "1.0.1" }
-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 = "0.8.10"
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.31" }
-semver = "1"
+provwasm-std = { version = "=2.1.0" }
+cw-utils = { version = "=1.0.1" }
+cosmwasm-schema = { version = "=1.2.5" }
+cosmwasm-std = { version = "=1.2.5", features = ["cosmwasm_1_1"] }
+cw-storage-plus = { version = "=1.1.0", features = ["iterator"] }
+cw2 = "=1.1.0"
+schemars = "=0.8.16"
+serde = { version = "=1.0.196", default-features = false, features = ["derive"] }
+thiserror = { version = "=1.0.56" }
+semver = "1.0.21"
 
 [dev-dependencies]
-provwasm-mocks = { version = "2.0.0" }
-cw-multi-test = "0.17.0"
+provwasm-mocks = { version = "=2.1.0" }