Merge pull request #2169 from CosmWasm/chipshort/fix-cw-migrate-version

Fix `cw_migrate_version`

Author: chipshort

contracts/hackatom/src/contract.rs

@@ -36,6 +36,7 @@ pub fn instantiate(
 }
 
 #[entry_point]
+#[migrate_version(42)]
 pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, HackError> {
     let data = deps
         .storage

packages/derive/src/lib.rs

@@ -145,6 +145,8 @@ fn expand_attributes(func: &mut ItemFn) -> syn::Result<TokenStream> {
         }
 
         let version = version.base10_digits();
+        let n = version.len();
+        let version = proc_macro2::Literal::byte_string(version.as_bytes());
 
         stream = quote! {
             #stream
@@ -155,7 +157,7 @@ fn expand_attributes(func: &mut ItemFn) -> syn::Result<TokenStream> {
             #[link_section = "cw_migrate_version"]
             /// This is an internal constant exported as a custom section denoting the contract migrate version.
             /// The format and even the existence of this value is an implementation detail, DO NOT RELY ON THIS!
-            static __CW_MIGRATE_VERSION: &str = #version;
+            static __CW_MIGRATE_VERSION: [u8; #n] = *#version;
         };
     }
 
@@ -267,7 +269,7 @@ mod test {
             #[link_section = "cw_migrate_version"]
             /// This is an internal constant exported as a custom section denoting the contract migrate version.
             /// The format and even the existence of this value is an implementation detail, DO NOT RELY ON THIS!
-            static __CW_MIGRATE_VERSION: &str = "2";
+            static __CW_MIGRATE_VERSION: [u8; 1usize] = *b"2";
 
             fn migrate(deps: DepsMut, env: Env, msg: MigrateMsg) -> Response {
                 // Logic here

packages/vm/src/cache.rs

@@ -1416,7 +1416,7 @@ mod tests {
                     E::Query
                 ]),
                 required_capabilities: BTreeSet::new(),
-                contract_migrate_version: None,
+                contract_migrate_version: Some(42),
             }
         );
 

packages/vm/src/instance.rs

@@ -914,7 +914,7 @@ mod tests {
 
         let report2 = instance.create_gas_report();
         assert_eq!(report2.used_externally, 251);
-        assert_eq!(report2.used_internally, 12109530);
+        assert_eq!(report2.used_internally, 11473730);
         assert_eq!(report2.limit, LIMIT);
         assert_eq!(
             report2.remaining,
@@ -1105,7 +1105,7 @@ mod tests {
             .unwrap();
 
         let init_used = orig_gas - instance.get_gas_left();
-        assert_eq!(init_used, 12109781);
+        assert_eq!(init_used, 11473981);
     }
 
     #[test]
@@ -1130,7 +1130,7 @@ mod tests {
             .unwrap();
 
         let execute_used = gas_before_execute - instance.get_gas_left();
-        assert_eq!(execute_used, 12658786);
+        assert_eq!(execute_used, 12086566);
     }
 
     #[test]
@@ -1173,6 +1173,6 @@ mod tests {
         );
 
         let query_used = gas_before_query - instance.get_gas_left();
-        assert_eq!(query_used, 8094896);
+        assert_eq!(query_used, 7570446);
     }
 }

packages/vm/testdata/hackatom.wasm

@@ -1 +1 @@
-hackatom_1.2.wasm
+hackatom_1.3.wasm