Conditional migrate call with extra MigrateInfo argument after contra…

…ct update (#2212)

.circleci/config.yml

@@ -637,6 +637,7 @@ jobs:
             - cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }}
       - check_contract:
           min_version: "1.4"
+          skip_cosmwasm_check: true
       - save_cache:
           paths:
             - /usr/local/cargo/registry

CHANGELOG.md

@@ -21,10 +21,16 @@ and this project adheres to
   validation. ([#2220])
 - cosmwasm-check: Add `--wasm-limits` flag to supply configured limits for
   static validation. ([#2220])
+- cosmwasm-std: Add `migrate_with_info` call implementation for the extended
+  `migrate` entrypoint function ([#2212])
+- cosmwasm-vm: Export a new `migrate_with_info` function ([#2212])
+- cosmwasm-derive: Add support for migrate method with
+  `migrate_info: MigrateInfo` argument. ([#2212])
 
 [#2118]: https://github.com/CosmWasm/cosmwasm/pull/2118
 [#2196]: https://github.com/CosmWasm/cosmwasm/pull/2196
 [#2220]: https://github.com/CosmWasm/cosmwasm/pull/2220
+[#2212]: https://github.com/CosmWasm/cosmwasm/pull/2212
 
 ### Changed
 

contracts/README.md

@@ -18,7 +18,7 @@ Introducing the development contracts in the order they were created.
    [mask contract](https://medium.com/cosmwasm/introducing-the-mask-41d11e51bccf),
    which allows the user to send messages to the contract which are then emitted
    with the contract as the sender. It later got support to handle sub messages
-   and replys ([#796](https://github.com/CosmWasm/cosmwasm/pull/796)).
+   and replies ([#796](https://github.com/CosmWasm/cosmwasm/pull/796)).
 4. **staking** is a staking derivatives example showing how the contract itself
    can be a delegator.
 5. **burner** shows how contract migrations work, which were added in CosmWasm

contracts/hackatom/Cargo.toml

@@ -30,7 +30,7 @@ cranelift = ["cosmwasm-vm/cranelift"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }
-cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["std", "abort"] }
+cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["std", "abort", "cosmwasm_2_2"] }
 schemars = "0.8.12"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 sha2 = "0.10"

contracts/hackatom/src/contract.rs

@@ -2,8 +2,8 @@ use sha2::{Digest, Sha256};
 
 use cosmwasm_std::{
     entry_point, from_json, to_json_binary, to_json_vec, Addr, AllBalanceResponse, Api, BankMsg,
-    BankQuery, CanonicalAddr, Deps, DepsMut, Env, Event, MessageInfo, QueryRequest, QueryResponse,
-    Response, StdError, StdResult, WasmMsg, WasmQuery,
+    BankQuery, CanonicalAddr, Deps, DepsMut, Env, Event, MessageInfo, MigrateInfo, QueryRequest,
+    QueryResponse, Response, StdError, StdResult, WasmMsg, WasmQuery,
 };
 
 use crate::errors::HackError;
@@ -35,9 +35,21 @@ pub fn instantiate(
     Ok(Response::new().add_attribute("Let the", "hacking begin"))
 }
 
+const CONTRACT_MIGRATE_VERSION: u64 = 420;
+
 #[entry_point]
-#[migrate_version(42)]
-pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, HackError> {
+#[migrate_version(CONTRACT_MIGRATE_VERSION)]
+pub fn migrate(
+    deps: DepsMut,
+    _env: Env,
+    msg: MigrateMsg,
+    migrate_info: MigrateInfo,
+) -> Result<Response, HackError> {
+    if let Some(old_version) = migrate_info.old_migrate_version {
+        if CONTRACT_MIGRATE_VERSION <= old_version {
+            return Err(HackError::Downgrade);
+        }
+    }
     let data = deps
         .storage
         .get(CONFIG_KEY)
@@ -379,7 +391,11 @@ mod tests {
         let msg = MigrateMsg {
             verifier: new_verifier.clone(),
         };
-        let res = migrate(deps.as_mut(), mock_env(), msg).unwrap();
+        let migrate_info = MigrateInfo {
+            sender: creator,
+            old_migrate_version: None,
+        };
+        let res = migrate(deps.as_mut(), mock_env(), msg, migrate_info).unwrap();
         assert_eq!(0, res.messages.len());
 
         // check it is 'someone else'

contracts/hackatom/src/errors.rs

@@ -9,4 +9,7 @@ pub enum HackError {
     // this is whatever we want
     #[error("Unauthorized")]
     Unauthorized {},
+    // this is whatever we want
+    #[error("Downgrade is not supported")]
+    Downgrade,
 }

contracts/hackatom/tests/integration.rs

@@ -19,12 +19,12 @@
 
 use cosmwasm_std::{
     assert_approx_eq, coins, from_json, to_json_vec, Addr, AllBalanceResponse, BankMsg, Binary,
-    ContractResult, Empty, Response, SubMsg,
+    ContractResult, Empty, MigrateInfo, Response, SubMsg,
 };
 use cosmwasm_vm::{
     call_execute, from_slice,
     testing::{
-        execute, instantiate, migrate, mock_env, mock_info, mock_instance,
+        execute, instantiate, migrate_with_info, mock_env, mock_info, mock_instance,
         mock_instance_with_balances, query, sudo, test_io, MockApi, MOCK_CONTRACT_ADDR,
     },
     Storage, VmError,
@@ -53,7 +53,7 @@ fn make_init_msg(api: &MockApi) -> (InstantiateMsg, String) {
 #[test]
 fn proper_initialization() {
     let mut deps = mock_instance(WASM, &[]);
-    assert_eq!(deps.required_capabilities().len(), 0);
+    assert_eq!(deps.required_capabilities().len(), 7);
 
     let verifier = deps.api().addr_make("verifies");
     let beneficiary = deps.api().addr_make("benefits");
@@ -142,7 +142,11 @@ fn migrate_verifier() {
     let msg = MigrateMsg {
         verifier: someone_else.clone(),
     };
-    let res: Response = migrate(&mut deps, mock_env(), msg).unwrap();
+    let migrate_info = MigrateInfo {
+        sender: Addr::unchecked(creator),
+        old_migrate_version: None,
+    };
+    let res: Response = migrate_with_info(&mut deps, mock_env(), msg, migrate_info).unwrap();
     assert_eq!(0, res.messages.len());
 
     // check it is 'someone else'

packages/check/src/main.rs

@@ -13,7 +13,7 @@ use cosmwasm_vm::internals::{check_wasm, compile, make_compiling_engine, LogOutp
 use cosmwasm_vm::{capabilities_from_csv, WasmLimits};
 
 const DEFAULT_AVAILABLE_CAPABILITIES: &str =
-    "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4,cosmwasm_2_0,cosmwasm_2_1";
+    "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4,cosmwasm_2_0,cosmwasm_2_1,cosmwasm_2_2";
 
 pub fn main() {
     let matches = Command::new("Contract checking")