Merge pull request #977 from CosmWasm/bump_interface_version

Bump interface version to interface_version_6

Author: webmaster128

CHANGELOG.md

@@ -56,6 +56,8 @@ and this project adheres to
 - contracts: Rename `ReflectSubCall` to `ReflectSubMsg` and `SubCallResult` to
   `SubCallMsg` in the `reflect` contract.
 - cosmwasm-std: Rename the `subcall` module to `submessages`.
+- cosmwasm-vm: Bump required marker export `cosmwasm_vm_version_5` to
+  `interface_version_6`.
 
 [#961]: https://github.com/CosmWasm/cosmwasm/pull/961
 

packages/std/src/entry_points.rs

@@ -81,7 +81,7 @@ macro_rules! create_entry_points {
 
             $crate::create_entry_points!(@migration; $contract, $migration);
 
-            // Other C externs like interface_version_5, allocate, deallocate are available
+            // Other C externs like interface_version_6, allocate, deallocate are available
             // automatically because we `use cosmwasm_std`.
         }
     };

packages/std/src/exports.rs

@@ -1,6 +1,6 @@
 //! exports exposes the public wasm API
 //!
-//! interface_version_5, allocate and deallocate turn into Wasm exports
+//! interface_version_6, allocate and deallocate turn into Wasm exports
 //! as soon as cosmwasm_std is `use`d in the contract, even privately.
 //!
 //! `do_execute`, `do_instantiate`, `do_migrate`, `do_query`, `do_reply`
@@ -33,7 +33,7 @@ extern "C" fn requires_stargate() -> () {}
 /// They can be checked by cosmwasm_vm.
 /// Update this whenever the Wasm VM interface breaks.
 #[no_mangle]
-extern "C" fn interface_version_5() -> () {}
+extern "C" fn interface_version_6() -> () {}
 
 /// allocate reserves the given number of bytes in wasm memory and returns a pointer
 /// to a Region defining this data. This space is managed by the calling process

packages/vm/README.md

@@ -16,6 +16,7 @@ compatibility list:
 
 | cosmwasm-vm | Supported interface versions | cosmwasm-std |
 | ----------- | ---------------------------- | ------------ |
+| 0.15        | `interface_version_6`        | 0.15         |
 | 0.14        | `interface_version_5`        | 0.14         |
 | 0.13        | `cosmwasm_vm_version_4`      | 0.11-0.13    |
 | 0.12        | `cosmwasm_vm_version_4`      | 0.11-0.13    |
@@ -24,6 +25,14 @@ compatibility list:
 | 0.9         | `cosmwasm_vm_version_2`      | 0.9          |
 | 0.8         | `cosmwasm_vm_version_1`      | 0.8          |
 
+### Changes between interface versions
+
+**interface_version_5 -> interface_version_6**
+
+- Rename the fields from `send` to `funds` in `WasmMsg::Instantiate` and
+  `WasmMsg::Execute`.
+- Merge messages and sub-messages.
+
 ## Setup
 
 There are demo files in `testdata/*.wasm`. Those are compiled and optimized
@@ -47,6 +56,12 @@ docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
   cosmwasm/rust-optimizer:0.11.4 ./contracts/ibc-reflect \
   && cp artifacts/ibc_reflect.wasm packages/vm/testdata/ibc_reflect_0.15.wasm
+
+docker run --rm -v "$(pwd)":/code \
+  --mount type=volume,source="devcontract_cache_floaty",target=/code/contracts/floaty/target \
+  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+  cosmwasm/rust-optimizer:0.11.4 ./contracts/floaty \
+  && cp artifacts/floaty.wasm packages/vm/testdata/floaty.wasm
 ```
 
 ## Testing

packages/vm/src/compatibility.rs

@@ -32,7 +32,7 @@ const SUPPORTED_IMPORTS: &[&str] = &[
 /// Other optional exports exist, e.g. "execute", "migrate" and "query".
 /// This is unlikely to change much, must be frozen at 1.0 to avoid breaking existing contracts
 const REQUIRED_EXPORTS: &[&str] = &[
-    "interface_version_5",
+    "interface_version_6",
     "instantiate",
     "allocate",
     "deallocate",
@@ -169,15 +169,15 @@ mod tests {
     fn check_wasm_old_contract() {
         match check_wasm(CONTRACT_0_7, &default_features()) {
             Err(VmError::StaticValidationErr { msg, .. }) => assert!(msg.starts_with(
-                "Wasm contract doesn't have required export: \"interface_version_5\""
+                "Wasm contract doesn't have required export: \"interface_version_6\""
             )),
             Err(e) => panic!("Unexpected error {:?}", e),
             Ok(_) => panic!("This must not succeeed"),
         };
 
         match check_wasm(CONTRACT_0_6, &default_features()) {
             Err(VmError::StaticValidationErr { msg, .. }) => assert!(msg.starts_with(
-                "Wasm contract doesn't have required export: \"interface_version_5\""
+                "Wasm contract doesn't have required export: \"interface_version_6\""
             )),
             Err(e) => panic!("Unexpected error {:?}", e),
             Ok(_) => panic!("This must not succeeed"),
@@ -291,7 +291,7 @@ mod tests {
         match check_wasm_exports(&module) {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with(
-                    "Wasm contract doesn't have required export: \"interface_version_5\""
+                    "Wasm contract doesn't have required export: \"interface_version_6\""
                 ));
             }
             Err(e) => panic!("Unexpected error {:?}", e),
@@ -305,7 +305,7 @@ mod tests {
         match check_wasm_exports(&module) {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with(
-                    "Wasm contract doesn't have required export: \"interface_version_5\""
+                    "Wasm contract doesn't have required export: \"interface_version_6\""
                 ));
             }
             Err(e) => panic!("Unexpected error {:?}", e),

packages/vm/src/environment.rs

@@ -704,7 +704,7 @@ mod tests {
         let (env, _instance) = make_instance(TESTING_GAS_LIMIT);
         leave_default_data(&env);
 
-        env.call_function0("interface_version_5", &[]).unwrap();
+        env.call_function0("interface_version_6", &[]).unwrap();
     }
 
     #[test]

packages/vm/src/instance.rs

@@ -391,7 +391,7 @@ mod tests {
         let instance = mock_instance(&CONTRACT, &[]);
 
         instance
-            .call_function0("interface_version_5", &[])
+            .call_function0("interface_version_6", &[])
             .expect("error calling function");
     }
 
@@ -534,7 +534,7 @@ mod tests {
 
                 (type (func))
                 (func (type 0) nop)
-                (export "interface_version_5" (func 0))
+                (export "interface_version_6" (func 0))
                 (export "instantiate" (func 0))
                 (export "allocate" (func 0))
                 (export "deallocate" (func 0))
@@ -552,7 +552,7 @@ mod tests {
 
                 (type (func))
                 (func (type 0) nop)
-                (export "interface_version_5" (func 0))
+                (export "interface_version_6" (func 0))
                 (export "instantiate" (func 0))
                 (export "allocate" (func 0))
                 (export "deallocate" (func 0))
@@ -606,7 +606,7 @@ mod tests {
 
         let report2 = instance.create_gas_report();
         assert_eq!(report2.used_externally, 73);
-        assert_eq!(report2.used_internally, 38880);
+        assert_eq!(report2.used_internally, 36378);
         assert_eq!(report2.limit, LIMIT);
         assert_eq!(
             report2.remaining,
@@ -805,7 +805,7 @@ mod singlepass_tests {
             .unwrap();
 
         let init_used = orig_gas - instance.get_gas_left();
-        assert_eq!(init_used, 38953);
+        assert_eq!(init_used, 36451);
     }
 
     #[test]
@@ -828,7 +828,7 @@ mod singlepass_tests {
             .unwrap();
 
         let execute_used = gas_before_execute - instance.get_gas_left();
-        assert_eq!(execute_used, 159317);
+        assert_eq!(execute_used, 159020);
     }
 
     #[test]
@@ -862,6 +862,6 @@ mod singlepass_tests {
         assert_eq!(answer.as_slice(), b"{\"verifier\":\"verifies\"}");
 
         let query_used = gas_before_query - instance.get_gas_left();
-        assert_eq!(query_used, 28999);
+        assert_eq!(query_used, 27629);
     }
 }

packages/vm/src/static_analysis.rs

@@ -124,7 +124,7 @@ mod tests {
 
                 (type (func))
                 (func (type 0) nop)
-                (export "interface_version_5" (func 0))
+                (export "interface_version_6" (func 0))
                 (export "instantiate" (func 0))
                 (export "allocate" (func 0))
                 (export "deallocate" (func 0))
@@ -142,7 +142,7 @@ mod tests {
 
                 (type (func))
                 (func (type 0) nop)
-                (export "interface_version_5" (func 0))
+                (export "interface_version_6" (func 0))
                 (export "instantiate" (func 0))
                 (export "execute" (func 0))
                 (export "allocate" (func 0))
@@ -167,7 +167,7 @@ mod tests {
 
                 (type (func))
                 (func (type 0) nop)
-                (export "interface_version_5" (func 0))
+                (export "interface_version_6" (func 0))
                 (export "instantiate" (func 0))
                 (export "execute" (func 0))
                 (export "allocate" (func 0))