Upgrade contracts to cosmwasm 2

Cargo.toml

@@ -4,8 +4,8 @@ resolver = "2"
 
 [workspace.dependencies]
 # nois = { git = "https://github.com/noislabs/nois", branch = "add-published-time" }
-nois = "0.7.0"
-cw2 = "1.1.1"
+nois = "2.0.0"
+cw2 = "2"
 
 [profile.release.package.nois-protocol]
 codegen-units = 1

contracts/nois-demo/Cargo.toml

@@ -12,14 +12,11 @@ license = "Apache-2.0"
 crate-type = ["cdylib", "rlib"]
 
 [features]
-# for quicker tests, cargo test --lib
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
-cosmwasm-std = { version = "1.5.4", features = ["iterator"] }
-cosmwasm-schema = { version = "1.5.4" }
-cw-storage-plus = { version = "1.1.0" }
+cosmwasm-std = { version = "2.0.4", features = ["iterator"] }
+cosmwasm-schema = { version = "2.0.4" }
+cw-storage-plus = { version = "2" }
 nois.workspace = true
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }

contracts/nois-demo/src/contract.rs

@@ -123,7 +123,7 @@ fn query_result(deps: Deps, job_id: String) -> StdResult<Option<Decimal>> {
 mod tests {
     use super::*;
     use cosmwasm_std::{
-        testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage},
+        testing::{message_info, mock_dependencies, mock_env, MockApi, MockQuerier, MockStorage},
         Empty, HexBinary, OwnedDeps, Timestamp,
     };
 
@@ -133,49 +133,54 @@ mod tests {
     #[test]
     fn instantiate_works() {
         let mut deps = mock_dependencies();
+        let creator = deps.api.addr_make(CREATOR);
         let msg = InstantiateMsg {
-            nois_proxy: "address123".to_string(),
+            nois_proxy: deps.api.addr_make("address123").into(),
         };
-        let info = mock_info(CREATOR, &[]);
+        let info = message_info(&creator, &[]);
         let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
         assert_eq!(0, res.messages.len());
     }
 
     #[test]
     fn instantiate_fails_for_invalid_proxy_address() {
         let mut deps = mock_dependencies();
+        let creator = deps.api.addr_make(CREATOR);
         let msg = InstantiateMsg {
             nois_proxy: "".to_string(),
         };
-        let info = mock_info(CREATOR, &[]);
+        let info = message_info(&creator, &[]);
         let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap_err();
         assert_eq!(res, ContractError::InvalidProxyAddress);
     }
 
     fn instantiate_proxy() -> OwnedDeps<MockStorage, MockApi, MockQuerier, Empty> {
         let mut deps = mock_dependencies();
+        let creator = deps.api.addr_make(CREATOR);
         let msg = InstantiateMsg {
-            nois_proxy: PROXY_ADDRESS.to_string(),
+            nois_proxy: deps.api.addr_make(PROXY_ADDRESS).into(),
         };
-        let info = mock_info(CREATOR, &[]);
+        let info = message_info(&creator, &[]);
         instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
         deps
     }
 
     #[test]
     fn execute_estimate_pi_works() {
         let mut deps = instantiate_proxy();
+        let guest = deps.api.addr_make("guest");
 
         let msg = ExecuteMsg::EstimatePi {
             job_id: "123".to_owned(),
         };
-        let info = mock_info("guest", &[]);
+        let info = message_info(&guest, &[]);
         execute(deps.as_mut(), mock_env(), info, msg).unwrap();
     }
 
     #[test]
     fn execute_receive_works() {
         let mut deps = instantiate_proxy();
+        let proxy = deps.api.addr_make(PROXY_ADDRESS);
 
         let msg = ExecuteMsg::NoisReceive {
             callback: NoisCallback {
@@ -187,13 +192,14 @@ mod tests {
                 .unwrap(),
             },
         };
-        let info = mock_info(PROXY_ADDRESS, &[]);
+        let info = message_info(&proxy, &[]);
         execute(deps.as_mut(), mock_env(), info, msg).unwrap();
     }
 
     #[test]
     fn execute_receive_fails_for_wrong_sender() {
         let mut deps = instantiate_proxy();
+        let guest = deps.api.addr_make("guest");
 
         let msg = ExecuteMsg::NoisReceive {
             callback: NoisCallback {
@@ -205,7 +211,7 @@ mod tests {
                 .unwrap(),
             },
         };
-        let info = mock_info("guest", &[]);
+        let info = message_info(&guest, &[]);
         let err = execute(deps.as_mut(), mock_env(), info, msg).unwrap_err();
         assert!(matches!(err, ContractError::UnauthorizedReceive));
     }

contracts/nois-drand/Cargo.toml

@@ -12,18 +12,15 @@ license = "Apache-2.0"
 crate-type = ["cdylib", "rlib"]
 
 [features]
-# for quicker tests, cargo test --lib
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 
 [dependencies]
 nois.workspace = true
 drand-common = { path = "../../packages/drand-common" }
-cosmwasm-std = { version = "1.5.4", features = ["iterator", "ibc3"] }
-cosmwasm-schema = { version = "1.5.4" }
-cw-storage-plus = { version = "1.1.0" }
+cosmwasm-std = { version = "2.0.4", features = ["iterator"] }
+cosmwasm-schema = { version = "2.0.4" }
+cw-storage-plus = { version = "2" }
 cw2.workspace = true
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }