diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 42587da0..6516d477 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.1"
+          provenance_version: "v1.18.0"
           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.1"
+          provenance_version: "v1.18.0"
           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.1"
+          provenance_version: "v1.18.0"
           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.1"
+          provenance_version: "v1.18.0"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/msgfees_test.sh"
 
@@ -119,31 +119,10 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.1"
+          provenance_version: "v1.18.0"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/name_test.sh"
 
-#  test_nft_smart_contract:
-#    runs-on: ubuntu-latest
-#    name: Test NFT Smart Contract
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#      - name: Add wasm32 target
-#        run: |
-#          rustup target add wasm32-unknown-unknown
-#      - name: Build wasm binary
-#        run: |
-#          cd ./contracts/nft
-#          make all
-#      - name: Smart Contract Test setup
-#        uses: provenance-io/provenance-testing-action@v1.2.0
-#        with:
-#          github_token: ${{ secrets.GITHUB_TOKEN }}
-#          provenance_version: "v1.17.1"
-#          smart_contract_action_version: "v1.2.0"
-#          test_script: "./scripts/gh-action-test/nft_test.sh"
-
   test_scope_smart_contract:
     runs-on: ubuntu-latest
     name: Test Scope Smart Contract
@@ -161,7 +140,7 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.1"
+          provenance_version: "v1.18.0"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/scope_test.sh"
 
@@ -182,6 +161,6 @@ jobs:
         uses: provenance-io/provenance-testing-action@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          provenance_version: "v1.17.1"
+          provenance_version: "v1.18.0"
           smart_contract_action_version: "v1.2.0"
           test_script: "./scripts/gh-action-test/trigger_test.sh"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa030bb4..40ae8272 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@
 * Create security contract to link assets with a security
   type ([#138](https://github.com/provenance-io/provwasm/issues/138))
 * Bump to Provenance 1.18.0-rc2 ([#143](https://github.com/provenance-io/provwasm/issues/143))
+* remove nft, security, and template contracts ([#145](https://github.com/provenance-io/provwasm/pull/145))
+* Bump to Provenance 1.18.0 and add new exchange types ([#146](https://github.com/provenance-io/provwasm/issues/146))
+* Update dependencies, including cosmwasm 1.5 ([#147](https://github.com/provenance-io/provwasm/issues/147))
 
 ## Releases
 
diff --git a/Cargo.lock b/Cargo.lock
index c4cc8936..6762887c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -55,12 +55,6 @@ 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"
@@ -82,6 +76,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"
@@ -106,6 +106,12 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "bnum"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -148,9 +154,9 @@ checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
 
 [[package]]
 name = "cosmwasm-crypto"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ed6aa9f904de106fa16443ad14ec2abe75e94ba003bb61c681c0e43d4c58d2a"
+checksum = "9934c79e58d9676edfd592557dee765d2a6ef54c09d5aa2edb06156b00148966"
 dependencies = [
  "digest 0.10.7",
  "ecdsa",
@@ -171,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema"
-version = "1.2.8"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0864db0a1e0ba2abd35d1105d0487e779538f616daa0338697315cc1601bf24"
+checksum = "ac3e3a2136e2a60e8b6582f5dffca5d1a683ed77bf38537d330bc1dfccd69010"
 dependencies = [
  "cosmwasm-schema-derive",
  "schemars",
@@ -184,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "1.2.8"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cd0f686ff907612ed63fdff97906b3eafe169d560ebd428e92ef400fb56479f"
+checksum = "f5d803bea6bd9ed61bd1ee0b4a2eb09ee20dbb539cc6e0b8795614d20952ebb1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -195,11 +201,13 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-std"
-version = "1.2.8"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197ed654c41885e2d76b23bff8db11b0f9745bfdede0909de9daa564edb19187"
+checksum = "ef8666e572a3a2519010dde88c04d16e9339ae751b56b2bb35081fe3f7d6be74"
 dependencies = [
- "base64 0.13.1",
+ "base64",
+ "bech32",
+ "bnum",
  "cosmwasm-crypto",
  "cosmwasm-derive",
  "derivative",
@@ -209,8 +217,8 @@ dependencies = [
  "serde",
  "serde-json-wasm",
  "sha2 0.10.8",
+ "static_assertions",
  "thiserror",
- "uint",
 ]
 
 [[package]]
@@ -222,12 +230,6 @@ 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.5"
@@ -265,9 +267,9 @@ dependencies = [
 
 [[package]]
 name = "cw-storage-plus"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f0e92a069d62067f3472c62e30adedb4cab1754725c0f2a682b3128d2bf3c79"
+checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c"
 dependencies = [
  "cosmwasm-std",
  "schemars",
@@ -626,9 +628,9 @@ checksum = "3a9e3ffc93bf9ba3d42139380ec3255ff6006fdfb1ee3b75ca31c3e42d784296"
 
 [[package]]
 name = "k256"
-version = "0.13.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
 dependencies = [
  "cfg-if",
  "ecdsa",
@@ -905,7 +907,7 @@ dependencies = [
 
 [[package]]
 name = "provwasm-proc-macro"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "cosmwasm-std",
  "itertools 0.11.0",
@@ -922,7 +924,7 @@ dependencies = [
 name = "provwasm-std"
 version = "2.2.0"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "chrono",
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -1099,9 +1101,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
@@ -1117,18 +1119,18 @@ dependencies = [
 
 [[package]]
 name = "serde-json-wasm"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
+checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1148,9 +1150,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
  "itoa",
  "ryu",
@@ -1272,18 +1274,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1327,18 +1329,6 @@ 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 c4eeb792..b37a2829 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,30 +25,31 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 ### CosmWasm
-cosmwasm-schema = { version = "=1.2.8" }
-cosmwasm-std = { version = "=1.2.8", default-features = false }
-cw-storage-plus = { version = "=1.1.0" }
+
+cosmwasm-schema = { version = "1.5" }
+cosmwasm-std = { version = "1.5", default-features = false, features = ["cosmwasm_1_1"] }
+cw-storage-plus = { version = "1.2.0" }
 
 ### 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-proc-macro = { version = "0.1.1", 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 }
+base64 = "0.22.0"
+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 = [
+prost-types = { version = "0.11.9", default-features = false }
+prost-build = "0.11.9"
+schemars = "0.8.16"
+serde = { version = "1.0.197", default-features = false, features = [
     "derive",
 ] }
-serde_json = { version = "=1.0.113", features = ["std"] }
-thiserror = { version = "=1.0.56" }
+serde_json = { version = "1.0.115", features = ["std"] }
+thiserror = { version = "1.0.58" }
 
 [profile.release]
 opt-level = 3
diff --git a/RELEASE_CHANGELOG.md b/RELEASE_CHANGELOG.md
index 95026753..e75be7eb 100644
--- a/RELEASE_CHANGELOG.md
+++ b/RELEASE_CHANGELOG.md
@@ -4,4 +4,9 @@
 * 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))
+* Create security contract to link assets with a security
+  type ([#138](https://github.com/provenance-io/provwasm/issues/138))
 * Bump to Provenance 1.18.0-rc2 ([#143](https://github.com/provenance-io/provwasm/issues/143))
+* remove nft, security, and template contracts ([#145](https://github.com/provenance-io/provwasm/pull/145))
+* Bump to Provenance 1.18.0 and add new exchange types ([#146](https://github.com/provenance-io/provwasm/issues/146))
+* Update dependencies, including cosmwasm 1.5 ([#147](https://github.com/provenance-io/provwasm/issues/147))
\ No newline at end of file
diff --git a/contracts/attrs/src/contract.rs b/contracts/attrs/src/contract.rs
index a61e848d..1cd3c5f0 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};
@@ -139,7 +139,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)
@@ -163,11 +163,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()
@@ -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_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 })
         }
     }
 }
@@ -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_binary, Binary, CosmosMsg};
+    use cosmwasm_std::{from_json, Binary, CosmosMsg};
 
     use provwasm_mocks::mock_provenance_dependencies;
     use provwasm_std::types::provenance::attribute::v1::{
@@ -247,8 +247,7 @@ mod tests {
                         restricted: true,
                     }),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/provenance.name.v1.MsgBindNameRequest");
                 assert_eq!(value, &expected)
@@ -299,8 +298,7 @@ mod tests {
                         restricted: true,
                     }),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/provenance.name.v1.MsgBindNameRequest");
                 assert_eq!(value, &expected)
@@ -374,7 +372,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()
@@ -384,8 +382,7 @@ mod tests {
                     owner: MOCK_CONTRACT_ADDR.to_string(),
                     expiration_date: None,
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/provenance.attribute.v1.MsgAddAttributeRequest");
                 assert_eq!(value, &expected)
@@ -462,8 +459,7 @@ mod tests {
                     account: MOCK_CONTRACT_ADDR.to_string(),
                     owner: MOCK_CONTRACT_ADDR.to_string(),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(
                     type_url,
@@ -541,12 +537,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()
@@ -557,8 +553,7 @@ mod tests {
                     owner: MOCK_CONTRACT_ADDR.to_string(),
                     name: "label.contract.pb".to_string(),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(
                     type_url,
@@ -590,7 +585,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 {
@@ -610,7 +605,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()
@@ -638,7 +633,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()
 }
 
diff --git a/contracts/ibc/local/src/contract.rs b/contracts/ibc/local/src/contract.rs
index c6fa1b01..875d886c 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 13b79a3b..50bb65fc 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_binary, 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_binary(&msg.original_packet.data)?;
+    let packet: PacketMsg = from_json(&msg.original_packet.data)?;
     match packet {
         PacketMsg::WhoAmI {} => {
-            let res: AcknowledgementMsg<WhoAmIResponse> = from_binary(&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_binary(&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_binary(&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 9a9b10fd..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_binary, 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_binary(&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)
diff --git a/contracts/marker/src/contract.rs b/contracts/marker/src/contract.rs
index f8a2b307..52f5166c 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};
@@ -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_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)]
@@ -270,7 +270,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;
@@ -282,7 +282,6 @@ mod tests {
         MsgFinalizeRequest, MsgMintRequest, MsgTransferRequest, MsgWithdrawRequest,
         QueryEscrowRequest, QueryEscrowResponse, QueryMarkerRequest, QueryMarkerResponse,
     };
-    use std::convert::TryInto;
 
     #[test]
     fn valid_init() {
@@ -417,8 +416,7 @@ mod tests {
             administrator: contract_address,
             access: all_access(&env.contract.address),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create an access grant execute message
         let msg = ExecuteMsg::GrantAccess {
@@ -450,8 +448,7 @@ mod tests {
             denom: "budz".to_string(),
             administrator: env.contract.address.to_string(),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create a finalize marker execute message
         let msg = ExecuteMsg::Finalize {
@@ -483,8 +480,7 @@ mod tests {
             denom: "budz".to_string(),
             administrator: env.contract.address.to_string(),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create an activate marker execute message
         let msg = ExecuteMsg::Activate {
@@ -522,8 +518,7 @@ mod tests {
                 amount: "20".to_string(),
             }],
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create a withdraw execute message
         let msg = ExecuteMsg::Withdraw {
@@ -559,8 +554,7 @@ mod tests {
             }),
             administrator: env.contract.address.to_string(),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create a mint coins marker handler message
         let msg = ExecuteMsg::Mint {
@@ -596,8 +590,7 @@ mod tests {
             }),
             administrator: env.contract.address.to_string(),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create a burn coins marker handler message
         let msg = ExecuteMsg::Burn {
@@ -630,8 +623,7 @@ mod tests {
             denom: "budz".to_string(),
             administrator: env.contract.address.to_string(),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create a cancel marker handler message
         let msg = ExecuteMsg::Cancel {
@@ -663,8 +655,7 @@ mod tests {
             denom: "budz".to_string(),
             administrator: env.contract.address.to_string(),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create a destroy marker handler message
         let msg = ExecuteMsg::Destroy {
@@ -701,8 +692,7 @@ mod tests {
             from_address: env.contract.address.to_string(),
             to_address: "toaddress".to_string(),
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create a transfer execute message
         let msg = ExecuteMsg::Transfer {
@@ -779,7 +769,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,
diff --git a/contracts/msgfees/src/contract.rs b/contracts/msgfees/src/contract.rs
index 2eadf70b..400eb04c 100644
--- a/contracts/msgfees/src/contract.rs
+++ b/contracts/msgfees/src/contract.rs
@@ -178,8 +178,7 @@ mod tests {
                     from: MOCK_CONTRACT_ADDR.to_string(),
                     recipient_basis_points: "10000".to_string(),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(
                     type_url,
@@ -195,13 +194,12 @@ mod tests {
                 let expected: Binary = MsgSend {
                     from_address: MOCK_CONTRACT_ADDR.to_string(),
                     to_address: "to_address".to_string(),
-                    amount: vec![provwasm_std::types::cosmos::base::v1beta1::Coin {
+                    amount: vec![Coin {
                         denom: "nhash".to_string(),
                         amount: "100000".to_string(),
                     }],
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/cosmos.bank.v1beta1.MsgSend");
                 assert_eq!(value, &expected)
@@ -240,13 +238,12 @@ mod tests {
                 let expected: Binary = MsgSend {
                     from_address: MOCK_CONTRACT_ADDR.to_string(),
                     to_address: "to_address".to_string(),
-                    amount: vec![provwasm_std::types::cosmos::base::v1beta1::Coin {
+                    amount: vec![Coin {
                         denom: "nhash".to_string(),
                         amount: "100000".to_string(),
                     }],
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/cosmos.bank.v1beta1.MsgSend");
                 assert_eq!(value, &expected)
diff --git a/contracts/name/src/contract.rs b/contracts/name/src/contract.rs
index 77545f7f..ed9dfda6 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,20 +183,19 @@ 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,
         QueryReverseLookupResponse,
     };
-    use std::convert::TryInto;
 
     #[test]
     fn init_test() {
@@ -230,8 +229,7 @@ mod tests {
                         restricted: true,
                     }),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/provenance.name.v1.MsgBindNameRequest");
                 assert_eq!(value, &expected)
@@ -277,8 +275,7 @@ mod tests {
                         restricted: true,
                     }),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/provenance.name.v1.MsgBindNameRequest");
                 assert_eq!(value, &expected)
@@ -320,8 +317,7 @@ mod tests {
                         restricted: true,
                     }),
                 }
-                .try_into()
-                .unwrap();
+                .into();
 
                 assert_eq!(type_url, "/provenance.name.v1.MsgDeleteNameRequest");
                 assert_eq!(value, &expected)
@@ -406,7 +402,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 +429,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 +455,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);
     }
 }
diff --git a/contracts/scope/src/contract.rs b/contracts/scope/src/contract.rs
index 74e4513b..0edb9392 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};
@@ -106,7 +106,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_binary(&contract_spec_response)
+    to_json_binary(&contract_spec_response)
 }
 
 // Use a ProvenanceQuerier to get a scope by ID.
@@ -121,7 +121,7 @@ fn try_get_scope(deps: Deps, id: String) -> Result<QueryResponse, StdError> {
         false,
         false,
     )?;
-    to_binary(&scope_response)
+    to_json_binary(&scope_response)
 }
 
 // Use a ProvenanceQuerier to get sessions for a scope.
@@ -137,7 +137,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.
@@ -153,7 +153,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
@@ -173,12 +173,12 @@ fn try_get_records_by_name(
         false,
         false,
     )?;
-    to_binary(&records_response)
+    to_json_binary(&records_response)
 }
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::from_binary;
+    use cosmwasm_std::from_json;
     use cosmwasm_std::testing::{mock_env, mock_info};
 
     use provwasm_mocks::mock_provenance_dependencies;
@@ -256,7 +256,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)
     }
 
@@ -307,7 +307,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)
     }
 
@@ -404,7 +404,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)
     }
 
@@ -468,7 +468,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);
     }
 }
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)?)?),
     }
 }
 
diff --git a/contracts/tutorial/src/contract.rs b/contracts/tutorial/src/contract.rs
index 62271d3e..6adecdb9 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};
@@ -93,7 +93,7 @@ pub fn query(
     match msg {
         QueryMsg::QueryRequest {} => {
             let state = CONFIG.load(deps.storage)?;
-            let json = to_binary(&state)?;
+            let json = to_json_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_binary, Addr};
+//     use cosmwasm_std::{from_json, 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_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"));
diff --git a/dependencies/provenance b/dependencies/provenance
index b27b3f0f..dd0940e9 160000
--- a/dependencies/provenance
+++ b/dependencies/provenance
@@ -1 +1 @@
-Subproject commit b27b3f0fa2f794f37fc48a70c69bcb1b8ba12218
+Subproject commit dd0940e94575b4c8f22af51603d3703b39c9a3a9
diff --git a/packages/proto-build/provenance.buf.gen.yaml b/packages/proto-build/provenance.buf.gen.yaml
index 8d443163..30ffb6a3 100644
--- a/packages/proto-build/provenance.buf.gen.yaml
+++ b/packages/proto-build/provenance.buf.gen.yaml
@@ -88,12 +88,18 @@ types:
     - provenance.exchange.v1.MsgCreateBidResponse
     - provenance.exchange.v1.MsgCancelOrderRequest
     - provenance.exchange.v1.MsgCancelOrderResponse
+    - provenance.exchange.v1.MsgCommitFundsRequest
+    - provenance.exchange.v1.MsgCommitFundsResponse
     - provenance.exchange.v1.MsgFillBidsRequest
     - provenance.exchange.v1.MsgFillBidsResponse
     - provenance.exchange.v1.MsgFillAsksRequest
     - provenance.exchange.v1.MsgFillAsksResponse
     - provenance.exchange.v1.MsgMarketSettleRequest
     - provenance.exchange.v1.MsgMarketSettleResponse
+    - provenance.exchange.v1.MsgMarketCommitmentSettleRequest
+    - provenance.exchange.v1.MsgMarketCommitmentSettleResponse
+    - provenance.exchange.v1.MsgMarketReleaseCommitmentsRequest
+    - provenance.exchange.v1.MsgMarketReleaseCommitmentsRequest
     - provenance.exchange.v1.MsgMarketSetOrderExternalIDRequest
     - provenance.exchange.v1.MsgMarketSetOrderExternalIDResponse
     - provenance.exchange.v1.MsgMarketWithdrawRequest
@@ -102,16 +108,36 @@ types:
     - provenance.exchange.v1.MsgMarketUpdateDetailsResponse
     - provenance.exchange.v1.MsgMarketUpdateEnabledRequest
     - provenance.exchange.v1.MsgMarketUpdateEnabledResponse
+    - provenance.exchange.v1.MsgMarketUpdateAcceptingOrdersRequest
+    - provenance.exchange.v1.MsgMarketUpdateAcceptingOrdersResponse
     - provenance.exchange.v1.MsgMarketUpdateUserSettleRequest
     - provenance.exchange.v1.MsgMarketUpdateUserSettleResponse
+    - provenance.exchange.v1.MsgMarketUpdateAcceptingCommitmentsRequest
+    - provenance.exchange.v1.MsgMarketUpdateAcceptingCommitmentsResponse
+    - provenance.exchange.v1.MsgMarketUpdateIntermediaryDenomRequest
+    - provenance.exchange.v1.MsgMarketUpdateIntermediaryDenomResponse
     - provenance.exchange.v1.MsgMarketManagePermissionsRequest
     - provenance.exchange.v1.MsgMarketManagePermissionsResponse
     - provenance.exchange.v1.MsgMarketManageReqAttrsRequest
     - provenance.exchange.v1.MsgMarketManageReqAttrsResponse
+    - provenance.exchange.v1.MsgCreatePaymentRequest
+    - provenance.exchange.v1.MsgCreatePaymentResponse
+    - provenance.exchange.v1.MsgAcceptPaymentRequest
+    - provenance.exchange.v1.MsgAcceptPaymentResponse
+    - provenance.exchange.v1.MsgRejectPaymentRequest
+    - provenance.exchange.v1.MsgRejectPaymentResponse
+    - provenance.exchange.v1.MsgRejectPaymentsRequest
+    - provenance.exchange.v1.MsgRejectPaymentsResponse
+    - provenance.exchange.v1.MsgCancelPaymentsRequest
+    - provenance.exchange.v1.MsgCancelPaymentsResponse
+    - provenance.exchange.v1.MsgChangePaymentTargetRequest
+    - provenance.exchange.v1.MsgChangePaymentTargetResponse
     - provenance.exchange.v1.MsgGovCreateMarketRequest
     - provenance.exchange.v1.MsgGovCreateMarketResponse
     - provenance.exchange.v1.MsgGovManageFeesRequest
     - provenance.exchange.v1.MsgGovManageFeesResponse
+    - provenance.exchange.v1.MsgGovCloseMarketRequest
+    - provenance.exchange.v1.MsgGovCloseMarketResponse
     - provenance.exchange.v1.MsgGovUpdateParamsRequest
     - provenance.exchange.v1.MsgGovUpdateParamsResponse
     - provenance.hold.v1.EventHoldAdded
diff --git a/packages/proto-build/src/main.rs b/packages/proto-build/src/main.rs
index 7ebbb115..7eac68d8 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.18.0-rc2";
+const PROVENANCE_REV: &str = "v1.18.0";
 
 // All paths must end with a / and either be absolute or include a ./ to reference the current
 // working directory.
diff --git a/packages/provwasm-common/Cargo.toml b/packages/provwasm-common/Cargo.toml
index 9d314eed..cc9e0b88 100644
--- a/packages/provwasm-common/Cargo.toml
+++ b/packages/provwasm-common/Cargo.toml
@@ -12,5 +12,4 @@ categories = ["cryptography::cryptocurrencies", "wasm"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = {workspace = true, features = ["stargate"]}
-
+cosmwasm-std = { workspace = true, features = ["stargate"] }
diff --git a/packages/provwasm-proc-macro/Cargo.toml b/packages/provwasm-proc-macro/Cargo.toml
index f583096f..d5e36528 100644
--- a/packages/provwasm-proc-macro/Cargo.toml
+++ b/packages/provwasm-proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "provwasm-proc-macro"
-version = "0.1.0"
+version = "0.1.1"
 repository = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
@@ -19,8 +19,8 @@ quote = "1.0.27"
 syn = "2.0.16"
 
 [dev-dependencies]
-cosmwasm-std = {workspace = true, features = ["stargate"]}
-prost = {workspace = true}
-serde = {workspace = true}
-trybuild = {version = "1.0.80", features = ["diff"]}
+cosmwasm-std = { workspace = true, features = ["stargate"] }
+prost = { workspace = true }
+serde = { workspace = true }
+trybuild = { version = "1.0.80", features = ["diff"] }
 provwasm-common = { workspace = true }
\ No newline at end of file
diff --git a/packages/provwasm-std/src/types/PROVENANCE_COMMIT b/packages/provwasm-std/src/types/PROVENANCE_COMMIT
index dc12d32f..13e94ce5 100644
--- a/packages/provwasm-std/src/types/PROVENANCE_COMMIT
+++ b/packages/provwasm-std/src/types/PROVENANCE_COMMIT
@@ -1 +1 @@
-v1.18.0-rc2
\ No newline at end of file
+v1.18.0
\ No newline at end of file
diff --git a/packages/provwasm-std/src/types/provenance/exchange/v1.rs b/packages/provwasm-std/src/types/provenance/exchange/v1.rs
index aee8a9c9..d7fc3df6 100644
--- a/packages/provwasm-std/src/types/provenance/exchange/v1.rs
+++ b/packages/provwasm-std/src/types/provenance/exchange/v1.rs
@@ -8,6 +8,42 @@
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.AccountAmount")]
+#[serde(rename_all = "snake_case")]
+pub struct AccountAmount {
+    #[prost(string, tag = "1")]
+    pub account: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "2")]
+    pub amount: ::prost::alloc::vec::Vec<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 = "/provenance.exchange.v1.NetAssetPrice")]
+#[serde(rename_all = "snake_case")]
+pub struct NetAssetPrice {
+    #[prost(message, optional, tag = "1")]
+    pub assets: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(message, optional, tag = "2")]
+    pub price: ::core::option::Option<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 = "/provenance.exchange.v1.EventOrderCreated")]
 #[serde(rename_all = "snake_case")]
 pub struct EventOrderCreated {
@@ -666,6 +702,12 @@ pub struct Params {
     pub default_split: u32,
     #[prost(message, repeated, tag = "2")]
     pub denom_splits: ::prost::alloc::vec::Vec<DenomSplit>,
+    #[prost(message, repeated, tag = "3")]
+    pub fee_create_payment_flat:
+        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(message, repeated, tag = "4")]
+    pub fee_accept_payment_flat:
+        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -695,6 +737,30 @@ pub struct DenomSplit {
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.Payment")]
+#[serde(rename_all = "snake_case")]
+pub struct Payment {
+    #[prost(string, tag = "1")]
+    pub source: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "2")]
+    pub source_amount: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "3")]
+    pub target: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "4")]
+    pub target_amount: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "5")]
+    pub external_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 = "/provenance.exchange.v1.MsgCreateAskRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgCreateAskRequest {
@@ -773,6 +839,43 @@ pub struct MsgCreateBidResponse {
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.MsgCommitFundsRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgCommitFundsRequest {
+    #[prost(string, tag = "1")]
+    pub account: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub market_id: u32,
+    #[prost(message, repeated, tag = "3")]
+    pub amount: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(message, optional, tag = "4")]
+    pub creation_fee: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "5")]
+    pub event_tag: ::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.exchange.v1.MsgCommitFundsResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgCommitFundsResponse {}
+#[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.MsgCancelOrderRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgCancelOrderRequest {
@@ -927,6 +1030,69 @@ pub struct MsgMarketSettleResponse {}
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.MsgMarketCommitmentSettleRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketCommitmentSettleRequest {
+    #[prost(string, tag = "1")]
+    pub admin: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub market_id: u32,
+    #[prost(message, repeated, tag = "3")]
+    pub inputs: ::prost::alloc::vec::Vec<AccountAmount>,
+    #[prost(message, repeated, tag = "4")]
+    pub outputs: ::prost::alloc::vec::Vec<AccountAmount>,
+    #[prost(message, repeated, tag = "5")]
+    pub fees: ::prost::alloc::vec::Vec<AccountAmount>,
+    #[prost(message, repeated, tag = "6")]
+    pub navs: ::prost::alloc::vec::Vec<NetAssetPrice>,
+    #[prost(string, tag = "7")]
+    pub event_tag: ::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.exchange.v1.MsgMarketCommitmentSettleResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketCommitmentSettleResponse {}
+#[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.MsgMarketReleaseCommitmentsRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketReleaseCommitmentsRequest {
+    #[prost(string, tag = "1")]
+    pub admin: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub market_id: u32,
+    #[prost(message, repeated, tag = "3")]
+    pub to_release: ::prost::alloc::vec::Vec<AccountAmount>,
+    #[prost(string, tag = "4")]
+    pub event_tag: ::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.exchange.v1.MsgMarketSetOrderExternalIDRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgMarketSetOrderExternalIdRequest {
@@ -1070,6 +1236,39 @@ pub struct MsgMarketUpdateEnabledResponse {}
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.MsgMarketUpdateAcceptingOrdersRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketUpdateAcceptingOrdersRequest {
+    #[prost(string, tag = "1")]
+    pub admin: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub market_id: u32,
+    #[prost(bool, tag = "3")]
+    pub accepting_orders: bool,
+}
+#[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.MsgMarketUpdateAcceptingOrdersResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketUpdateAcceptingOrdersResponse {}
+#[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.MsgMarketUpdateUserSettleRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgMarketUpdateUserSettleRequest {
@@ -1103,6 +1302,72 @@ pub struct MsgMarketUpdateUserSettleResponse {}
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.MsgMarketUpdateAcceptingCommitmentsRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketUpdateAcceptingCommitmentsRequest {
+    #[prost(string, tag = "1")]
+    pub admin: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub market_id: u32,
+    #[prost(bool, tag = "3")]
+    pub accepting_commitments: bool,
+}
+#[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.MsgMarketUpdateAcceptingCommitmentsResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketUpdateAcceptingCommitmentsResponse {}
+#[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.MsgMarketUpdateIntermediaryDenomRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketUpdateIntermediaryDenomRequest {
+    #[prost(string, tag = "1")]
+    pub admin: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub market_id: u32,
+    #[prost(string, tag = "3")]
+    pub intermediary_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 = "/provenance.exchange.v1.MsgMarketUpdateIntermediaryDenomResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgMarketUpdateIntermediaryDenomResponse {}
+#[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.MsgMarketManagePermissionsRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgMarketManagePermissionsRequest {
@@ -1183,6 +1448,192 @@ pub struct MsgMarketManageReqAttrsResponse {}
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.MsgCreatePaymentRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgCreatePaymentRequest {
+    #[prost(message, optional, tag = "1")]
+    pub payment: ::core::option::Option<Payment>,
+}
+#[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.MsgCreatePaymentResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgCreatePaymentResponse {}
+#[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.MsgAcceptPaymentRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgAcceptPaymentRequest {
+    #[prost(message, optional, tag = "1")]
+    pub payment: ::core::option::Option<Payment>,
+}
+#[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.MsgAcceptPaymentResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgAcceptPaymentResponse {}
+#[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.MsgRejectPaymentRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRejectPaymentRequest {
+    #[prost(string, tag = "1")]
+    pub target: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub source: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub external_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 = "/provenance.exchange.v1.MsgRejectPaymentResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRejectPaymentResponse {}
+#[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.MsgRejectPaymentsRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRejectPaymentsRequest {
+    #[prost(string, tag = "1")]
+    pub target: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "2")]
+    pub sources: ::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 = "/provenance.exchange.v1.MsgRejectPaymentsResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgRejectPaymentsResponse {}
+#[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.MsgCancelPaymentsRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgCancelPaymentsRequest {
+    #[prost(string, tag = "1")]
+    pub source: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "2")]
+    pub external_ids: ::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 = "/provenance.exchange.v1.MsgCancelPaymentsResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgCancelPaymentsResponse {}
+#[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.MsgChangePaymentTargetRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgChangePaymentTargetRequest {
+    #[prost(string, tag = "1")]
+    pub source: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub external_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub new_target: ::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.exchange.v1.MsgChangePaymentTargetResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgChangePaymentTargetResponse {}
+#[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.MsgGovCreateMarketRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgGovCreateMarketRequest {
@@ -1287,6 +1738,37 @@ pub struct MsgGovManageFeesResponse {}
     serde::Deserialize,
     provwasm_proc_macro::CosmwasmExt,
 )]
+#[proto_message(type_url = "/provenance.exchange.v1.MsgGovCloseMarketRequest")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgGovCloseMarketRequest {
+    #[prost(string, tag = "1")]
+    pub authority: ::prost::alloc::string::String,
+    #[prost(uint32, tag = "2")]
+    pub market_id: u32,
+}
+#[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.MsgGovCloseMarketResponse")]
+#[serde(rename_all = "snake_case")]
+pub struct MsgGovCloseMarketResponse {}
+#[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.MsgGovUpdateParamsRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgGovUpdateParamsRequest {