Update contract to provwasm 2.0

crates/contract-controller/Cargo.toml

@@ -27,8 +27,6 @@ incremental = false
 overflow-checks = true
 
 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 
@@ -45,20 +43,20 @@ optimize-arm = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-provwasm-std = { version = "1.1.0" }
-cw-utils = {version = "1.0.1"}
-cosmwasm-schema = "1.1.3"
-cosmwasm-std = { version = "1.1.3", features = ["cosmwasm_1_1"] }
-cosmwasm-storage = "1.1.3"
-cw-storage-plus = { version = "1.0.1", features = ["iterator"]}
-cw2 = "1.0.1"
+provwasm-std = { version = "2.3.0" }
+cw-utils = {version = "2.0.0"}
+cosmwasm-schema = "2.1.3"
+cosmwasm-std = { version = "2.1.3" }
+cosmwasm-storage = "1.5.2"
+cw-storage-plus = { version = "2.0.0", features = ["iterator"]}
+cw2 = "2.0.0"
 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 = { version = "1.1.0" }
+provwasm-mocks = { version = "2.3.0" }
 cw-multi-test = "0.16.2"
 prost = "0.11.0"
 anyhow = "1.0.65"

crates/contract-controller/Makefile

@@ -29,10 +29,4 @@ ifeq ($(UNAME_M),arm64)
 	@docker run --rm -v $(CURDIR):/code \
 		--mount type=volume,source="contract_controller_cache",target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer-arm64:0.12.8
-else
-	@docker run --rm -v $(CURDIR):/code \
-		--mount type=volume,source="contract_controller_cache",target=/code/target \
-		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.8
-endif
+		cosmwasm/rust-optimizer:0.16.0

crates/contract-controller/src/core/aliases.rs

@@ -1,11 +1,10 @@
 use cosmwasm_std::{Binary, CosmosMsg, Deps, DepsMut, Response, SubMsg};
-use provwasm_std::{ProvenanceMsg, ProvenanceQuery};
 
 use super::error::ContractError;
 
-pub type ProvDeps<'a> = Deps<'a, ProvenanceQuery>;
-pub type ProvDepsMut<'a> = DepsMut<'a, ProvenanceQuery>;
-pub type ProvTxResponse = Result<Response<ProvenanceMsg>, ContractError>;
+pub type ProvDeps<'a> = Deps<'a>;
+pub type ProvDepsMut<'a> = DepsMut<'a>;
+pub type ProvTxResponse = Result<Response, ContractError>;
 pub type ProvQueryResponse = Result<Binary, ContractError>;
-pub type ProvMsg = CosmosMsg<ProvenanceMsg>;
-pub type ProvSubMsg = SubMsg<ProvenanceMsg>;
+pub type ProvMsg = CosmosMsg;
+pub type ProvSubMsg = SubMsg;

crates/contract-controller/src/execute/validate.rs

@@ -41,7 +41,7 @@ impl Validate for ExecuteMsg {
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::Coin;
+    use cosmwasm_std::{Coin, Uint128};
 
     use crate::{
         core::error::ContractError,
@@ -76,7 +76,7 @@ mod tests {
     fn test_add_contracts_should_not_have_funds() {
         let message = test_add_contracts_message();
         let error = message
-            .validate_msg_funds(&[Coin::new(5, "nhash")])
+            .validate_msg_funds(&[Coin::new(Uint128::new(5), "nhash")])
             .unwrap_err();
         assert_eq!(
             ContractError::UnexpectedFunds {}.to_string(),
@@ -110,7 +110,7 @@ mod tests {
     fn test_remove_contracts_should_not_have_funds() {
         let message = test_remove_contracts_message();
         let error = message
-            .validate_msg_funds(&[Coin::new(5, "nhash")])
+            .validate_msg_funds(&[Coin::new(Uint128::new(5), "nhash")])
             .unwrap_err();
         assert_eq!(
             ContractError::UnexpectedFunds {}.to_string(),
@@ -144,7 +144,7 @@ mod tests {
     fn test_migrate_contracts_should_not_have_funds() {
         let message = test_migrate_contracts_message();
         let error = message
-            .validate_msg_funds(&[Coin::new(5, "nhash")])
+            .validate_msg_funds(&[Coin::new(Uint128::new(5), "nhash")])
             .unwrap_err();
         assert_eq!(
             ContractError::UnexpectedFunds {}.to_string(),
@@ -168,7 +168,7 @@ mod tests {
     fn test_migrate_all_contracts_should_not_have_funds() {
         let message = test_migrate_all_contracts_message();
         let error = message
-            .validate_msg_funds(&[Coin::new(5, "nhash")])
+            .validate_msg_funds(&[Coin::new(Uint128::new(5), "nhash")])
             .unwrap_err();
         assert_eq!(
             ContractError::UnexpectedFunds {}.to_string(),
@@ -192,7 +192,7 @@ mod tests {
     fn test_modify_batch_size_should_not_have_funds() {
         let message = test_modify_batch_size_message();
         let error = message
-            .validate_msg_funds(&[Coin::new(5, "nhash")])
+            .validate_msg_funds(&[Coin::new(Uint128::new(5), "nhash")])
             .unwrap_err();
         assert_eq!(
             ContractError::UnexpectedFunds {}.to_string(),

crates/contract-controller/src/instantiate/handler.rs

@@ -29,7 +29,7 @@ mod tests {
         Attribute,
     };
     use cw2::get_contract_version;
-    use provwasm_mocks::mock_dependencies;
+    use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
         core::constants::{CONTRACT_NAME, CONTRACT_VERSION},
@@ -41,7 +41,7 @@ mod tests {
 
     #[test]
     fn test_proper_instantiation() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let info = mock_info("sender", &[]);
         let msg = test_init_message();

crates/contract-controller/src/instantiate/validate.rs

@@ -20,7 +20,7 @@ impl Validate for InstantiateMsg {
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::Coin;
+    use cosmwasm_std::{Coin, Uint128};
 
     use crate::{
         core::error::ContractError,
@@ -37,7 +37,7 @@ mod tests {
     fn test_funds_throw_error() {
         let message = test_init_message();
         let error = message
-            .validate_msg_funds(&[Coin::new(50, "nhash")])
+            .validate_msg_funds(&[Coin::new(Uint128::new(50), "nhash")])
             .unwrap_err();
         assert_eq!(
             ContractError::UnexpectedFunds {}.to_string(),

crates/contract-controller/src/query/query_contract_address.rs

@@ -15,7 +15,7 @@ pub fn handle(storage: &dyn Storage, uuid: String) -> ProvQueryResponse {
 #[cfg(test)]
 mod tests {
     use cosmwasm_std::{from_binary, testing::mock_env, Addr};
-    use provwasm_mocks::mock_dependencies;
+    use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
         core::msg::QueryContractAddressResponse,
@@ -25,7 +25,7 @@ mod tests {
 
     #[test]
     fn test_query_contracts_handles_invalid() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let _ = instantiate_contract(deps.as_mut(), env).unwrap();
         handle(&deps.storage, "bad_address".to_string()).unwrap_err();

crates/contract-controller/src/query/query_contracts.rs

@@ -15,7 +15,7 @@ pub fn handle(storage: &dyn Storage) -> ProvQueryResponse {
 #[cfg(test)]
 mod tests {
     use cosmwasm_std::{from_binary, testing::mock_env, Addr};
-    use provwasm_mocks::mock_dependencies;
+    use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
         core::msg::QueryContractsResponse,
@@ -25,7 +25,7 @@ mod tests {
 
     #[test]
     fn test_query_contracts_handles_empty() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let _ = instantiate_contract(deps.as_mut(), env).unwrap();
         let bin_response = handle(&deps.storage).unwrap();

crates/contract-controller/src/query/query_state.rs

@@ -17,7 +17,7 @@ pub fn handle(storage: &dyn Storage) -> ProvQueryResponse {
 #[cfg(test)]
 mod tests {
     use cosmwasm_std::{from_binary, testing::mock_env, Uint128};
-    use provwasm_mocks::mock_dependencies;
+    use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
         core::msg::QueryStateResponse, query::query_state::handle,
@@ -26,7 +26,7 @@ mod tests {
 
     #[test]
     fn test_query_state_has_correct_default_values() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let _ = instantiate_contract(deps.as_mut(), env).unwrap();
         let bin_response = handle(&deps.storage).unwrap();

crates/contract-controller/src/query/query_version.rs

@@ -13,7 +13,7 @@ pub fn handle(storage: &dyn Storage) -> ProvQueryResponse {
 #[cfg(test)]
 mod tests {
     use cosmwasm_std::{from_binary, testing::mock_env};
-    use provwasm_mocks::mock_dependencies;
+    use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
         core::{
@@ -27,7 +27,7 @@ mod tests {
 
     #[test]
     fn test_query_version_has_correct_version() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let _ = instantiate_contract(deps.as_mut(), env).unwrap();
         let bin_response = handle(&deps.storage).unwrap();

crates/contract-controller/src/query/router.rs

@@ -21,7 +21,7 @@ pub fn route(deps: ProvDeps, _env: Env, msg: QueryMsg) -> ProvQueryResponse {
 #[cfg(test)]
 mod tests {
     use cosmwasm_std::{from_binary, testing::mock_env};
-    use provwasm_mocks::mock_dependencies;
+    use provwasm_mocks::mock_provenance_dependencies;
 
     use crate::{
         core::msg::{
@@ -34,7 +34,7 @@ mod tests {
 
     #[test]
     fn test_query_version_has_correct_response() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let message = QueryMsg::QueryVersion {};
         instantiate_contract(deps.as_mut(), env.clone()).unwrap();
@@ -44,7 +44,7 @@ mod tests {
 
     #[test]
     fn test_query_state_has_correct_response() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let message = QueryMsg::QueryState {};
         instantiate_contract(deps.as_mut(), env.clone()).unwrap();
@@ -54,7 +54,7 @@ mod tests {
 
     #[test]
     fn test_query_contracts_has_correct_response() {
-        let mut deps = mock_dependencies(&[]);
+        let mut deps = mock_provenance_dependencies();
         let env = mock_env();
         let message = QueryMsg::QueryContracts {};
         instantiate_contract(deps.as_mut(), env.clone()).unwrap();