Merge pull request #144 from provenance-io/issue/143

update to provenance 1.18.0-rc2

CHANGELOG.md

@@ -6,7 +6,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))
+* 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))
 
 ## Releases
 
@@ -22,7 +24,8 @@
 ### [v1.2.0](https://github.com/provenance-io/provwasm/tree/v1.2.0)
 
 * Update tutorial documentation ([#102](https://github.com/provenance-io/provwasm/issues/102))
-* Add Fee struct to make it easier to implement message fees ([#106](https://github.com/provenance-io/provwasm/issues/106))
+* Add Fee struct to make it easier to implement message
+  fees ([#106](https://github.com/provenance-io/provwasm/issues/106))
 * Added ProvenanceMsg From implementation ([#108](https://github.com/provenance-io/provwasm/issues/102))
 * Add forced transfer support for restricted markers ([#110](https://github.com/provenance-io/provwasm/issues/110))
 
@@ -38,7 +41,8 @@
 ### [v1.1.0](https://github.com/provenance-io/provwasm/tree/v1.1.0)
 
 * Smart Contract MsgFee Support ([#87](https://github.com/provenance-io/provwasm/issues/87))
-* Add `UpdateAttribute` and `DeleteDistinctAttribute` bindings ([#86](https://github.com/provenance-io/provwasm/issues/86))
+* Add `UpdateAttribute` and `DeleteDistinctAttribute`
+  bindings ([#86](https://github.com/provenance-io/provwasm/issues/86))
 
 ### [v1.0.0](https://github.com/provenance-io/provwasm/tree/v1.0.0)
 

Makefile

@@ -27,7 +27,7 @@ attrs:
 	@make -C contracts/attrs
 
 .PHONY: ibc
-attrs:
+ibc:
 	@make -C contracts/ibc
 
 .PHONY: marker
@@ -43,21 +43,21 @@ name:
 	@make -C contracts/name
 
 .PHONY: nft
-name:
+nft:
 	@make -C contracts/nft
 
+.PHONY: security
+security:
+	@make -C contracts/security
+
 .PHONY: scope
 scope:
 	@make -C contracts/scope
 
 .PHONY: template
-scope:
+template:
 	@make -C contracts/template
 
 .PHONY: trigger
-scope:
+trigger:
 	@make -C contracts/trigger
-
-.PHONY: security
-security:
-	@make -C contracts/security

RELEASE_CHANGELOG.md

@@ -4,3 +4,4 @@
 * 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))
+* Bump to Provenance 1.18.0-rc2 ([#143](https://github.com/provenance-io/provwasm/issues/143))

contracts/Makefile

@@ -1,5 +1,5 @@
 .PHONY: all
-all: attrs ibc marker msgfees name scope trigger tutorial
+all: attrs ibc marker msgfees name scope security trigger tutorial
 
 .PHONY: attrs
 attrs:
@@ -25,6 +25,10 @@ name:
 scope:
 	@make -C scope
 
+.PHONY: security
+security:
+	@make -C security
+
 .PHONY: trigger
 trigger:
 	@make -C trigger
@@ -41,3 +45,5 @@ clean:
 	@make -C msgfees clean
 	@make -C name clean
 	@make -C scope clean
+	@make -C trigger clean
+	@make -C tutorial clean

contracts/marker/src/contract.rs

@@ -327,9 +327,9 @@ mod tests {
             required_attributes: vec![],
             usd_cents: 0,
             volume: 0,
+            usd_mills: 0,
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create marker execute message
         let msg = ExecuteMsg::Create {
@@ -378,9 +378,9 @@ mod tests {
             required_attributes: vec![],
             usd_cents: 0,
             volume: 0,
+            usd_mills: 0,
         }
-        .try_into()
-        .unwrap();
+        .into();
 
         // Create marker execute message
         let msg = ExecuteMsg::Create {

contracts/marker/src/helpers.rs

@@ -66,6 +66,7 @@ pub fn create_marker<S: Into<String>>(
         required_attributes: vec![],
         usd_cents: 0,
         volume: 0,
+        usd_mills: 0,
     }
     .into())
 }

contracts/scope/src/contract.rs

@@ -84,6 +84,7 @@ pub fn try_write_scope(
         signers,
         scope_uuid: "".to_string(),
         spec_uuid: "".to_string(),
+        usd_mills: 0,
     }))
 }
 

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.1";
+const PROVENANCE_REV: &str = "v1.18.0-rc2";
 
 // All paths must end with a / and either be absolute or include a ./ to reference the current
 // working directory.

packages/provwasm-std/src/lib.rs

@@ -3,6 +3,7 @@ pub const PROVENANCE_VERSION: &str = include_str!("types/PROVENANCE_COMMIT");
 
 mod serde;
 pub mod shim;
+#[allow(clippy::too_many_arguments)]
 pub mod types;
 // Indicate that smart contracts that use this lib can only be run on the Provenance Blockchain.
 #[no_mangle]

packages/provwasm-std/src/types/PROVENANCE_COMMIT

@@ -1 +1 @@
-v1.17.1
+v1.18.0-rc2

packages/provwasm-std/src/types/cosmos/mod.rs

@@ -5,6 +5,7 @@ pub mod base;
 pub mod crypto;
 pub mod distribution;
 pub mod gov;
+pub mod msg;
 pub mod slashing;
 pub mod staking;
 pub mod tx;

packages/provwasm-std/src/types/cosmos/msg/mod.rs

@@ -0,0 +1 @@
+pub mod v1;

packages/provwasm-std/src/types/cosmos/msg/v1.rs

@@ -0,0 +1 @@
+

packages/provwasm-std/src/types/provenance/exchange/v1.rs

@@ -420,6 +420,17 @@ pub struct Market {
     pub req_attr_create_ask: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[prost(string, repeated, tag = "13")]
     pub req_attr_create_bid: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(bool, tag = "14")]
+    pub accepting_commitments: bool,
+    #[prost(message, repeated, tag = "15")]
+    pub fee_create_commitment_flat:
+        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(uint32, tag = "16")]
+    pub commitment_settlement_bips: u32,
+    #[prost(string, tag = "17")]
+    pub intermediary_denom: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "18")]
+    pub req_attr_create_commitment: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1026,10 +1037,13 @@ pub struct MsgMarketUpdateDetailsResponse {}
 #[proto_message(type_url = "/provenance.exchange.v1.MsgMarketUpdateEnabledRequest")]
 #[serde(rename_all = "snake_case")]
 pub struct MsgMarketUpdateEnabledRequest {
+    #[deprecated]
     #[prost(string, tag = "1")]
     pub admin: ::prost::alloc::string::String,
+    #[deprecated]
     #[prost(uint32, tag = "2")]
     pub market_id: u32,
+    #[deprecated]
     #[prost(bool, tag = "3")]
     pub accepting_orders: bool,
 }
@@ -1141,6 +1155,10 @@ pub struct MsgMarketManageReqAttrsRequest {
     pub create_bid_to_add: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[prost(string, repeated, tag = "6")]
     pub create_bid_to_remove: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, repeated, tag = "7")]
+    pub create_commitment_to_add: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, repeated, tag = "8")]
+    pub create_commitment_to_remove: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1235,6 +1253,16 @@ pub struct MsgGovManageFeesRequest {
     pub add_fee_buyer_settlement_ratios: ::prost::alloc::vec::Vec<FeeRatio>,
     #[prost(message, repeated, tag = "14")]
     pub remove_fee_buyer_settlement_ratios: ::prost::alloc::vec::Vec<FeeRatio>,
+    #[prost(message, repeated, tag = "15")]
+    pub add_fee_create_commitment_flat:
+        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(message, repeated, tag = "16")]
+    pub remove_fee_create_commitment_flat:
+        ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
+    #[prost(uint32, tag = "17")]
+    pub set_fee_commitment_settlement_bips: u32,
+    #[prost(bool, tag = "18")]
+    pub unset_fee_commitment_settlement_bips: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(

packages/provwasm-std/src/types/provenance/marker/v1.rs

@@ -70,6 +70,7 @@ pub enum Access {
     Delete = 5,
     Admin = 6,
     Transfer = 7,
+    ForceTransfer = 8,
 }
 impl Access {
     /// String value of the enum field names used in the ProtoBuf definition.
@@ -86,6 +87,7 @@ impl Access {
             Access::Delete => "ACCESS_DELETE",
             Access::Admin => "ACCESS_ADMIN",
             Access::Transfer => "ACCESS_TRANSFER",
+            Access::ForceTransfer => "ACCESS_FORCE_TRANSFER",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -99,6 +101,7 @@ impl Access {
             "ACCESS_DELETE" => Some(Self::Delete),
             "ACCESS_ADMIN" => Some(Self::Admin),
             "ACCESS_TRANSFER" => Some(Self::Transfer),
+            "ACCESS_FORCE_TRANSFER" => Some(Self::ForceTransfer),
             _ => None,
         }
     }
@@ -1228,6 +1231,7 @@ pub struct MsgAddMarkerRequest {
     pub allow_forced_transfer: bool,
     #[prost(string, repeated, tag = "11")]
     pub required_attributes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[deprecated]
     #[prost(uint64, tag = "12")]
     #[serde(
         serialize_with = "crate::serde::as_str::serialize",
@@ -1240,6 +1244,12 @@ pub struct MsgAddMarkerRequest {
         deserialize_with = "crate::serde::as_str::deserialize"
     )]
     pub volume: u64,
+    #[prost(uint64, tag = "14")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub usd_mills: u64,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(
@@ -1674,6 +1684,7 @@ pub struct MsgAddFinalizeActivateMarkerRequest {
     pub allow_forced_transfer: bool,
     #[prost(string, repeated, tag = "10")]
     pub required_attributes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[deprecated]
     #[prost(uint64, tag = "11")]
     #[serde(
         serialize_with = "crate::serde::as_str::serialize",
@@ -1686,6 +1697,12 @@ pub struct MsgAddFinalizeActivateMarkerRequest {
         deserialize_with = "crate::serde::as_str::deserialize"
     )]
     pub volume: u64,
+    #[prost(uint64, tag = "13")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub usd_mills: u64,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(

packages/provwasm-std/src/types/provenance/metadata/v1.rs

@@ -2150,6 +2150,12 @@ pub struct MsgWriteScopeRequest {
     pub scope_uuid: ::prost::alloc::string::String,
     #[prost(string, tag = "4")]
     pub spec_uuid: ::prost::alloc::string::String,
+    #[prost(uint64, tag = "5")]
+    #[serde(
+        serialize_with = "crate::serde::as_str::serialize",
+        deserialize_with = "crate::serde::as_str::deserialize"
+    )]
+    pub usd_mills: u64,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(