Merge pull request #2402 from CosmWasm/jawoznia/feat/ibcv2_analysis_report

Add info about ibc_v2 entrypoint to AnalysisReport (#2401)

Author: jawoznia

.circleci/config.yml

@@ -171,7 +171,7 @@ jobs:
       - run:
           name: "contracts/ibc2: integration-test"
           working_directory: ~/project/contracts/ibc2
-          command: cargo wasm --locked
+          command: cargo wasm --locked && cargo integration-test --locked
       - run:
           name: "contracts/queue: integration-test"
           working_directory: ~/project/contracts/queue

packages/vm/src/cache.rs

@@ -19,7 +19,7 @@ use crate::instance::{Instance, InstanceOptions};
 use crate::modules::{CachedModule, FileSystemCache, InMemoryCache, PinnedMemoryCache};
 use crate::parsed_wasm::ParsedWasm;
 use crate::size::Size;
-use crate::static_analysis::{Entrypoint, ExportInfo, REQUIRED_IBC_EXPORTS};
+use crate::static_analysis::{Entrypoint, ExportInfo, REQUIRED_IBC2_EXPORT, REQUIRED_IBC_EXPORTS};
 use crate::wasm_backend::{compile, make_compiling_engine};
 
 const STATE_DIR: &str = "state";
@@ -100,6 +100,9 @@ pub struct AnalysisReport {
     /// `true` if and only if all [`REQUIRED_IBC_EXPORTS`] exist as exported functions.
     /// This does not guarantee they are functional or even have the correct signatures.
     pub has_ibc_entry_points: bool,
+    /// `true` if and only if all [`REQUIRED_IBC2_EXPORT`] exist as exported functions.
+    /// This does not guarantee they are functional or even have the correct signatures.
+    pub has_ibc2_entry_points: bool,
     /// A set of all entrypoints that are exported by the contract.
     pub entrypoints: BTreeSet<Entrypoint>,
     /// The set of capabilities the contract requires.
@@ -337,6 +340,7 @@ where
             has_ibc_entry_points: REQUIRED_IBC_EXPORTS
                 .iter()
                 .all(|required| exports.contains(required.as_ref())),
+            has_ibc2_entry_points: exports.contains(REQUIRED_IBC2_EXPORT.as_ref()),
             entrypoints,
             required_capabilities: required_capabilities_from_module(&module)
                 .into_iter()
@@ -624,6 +628,7 @@ mod tests {
 
     static CONTRACT: &[u8] = include_bytes!("../testdata/hackatom.wasm");
     static IBC_CONTRACT: &[u8] = include_bytes!("../testdata/ibc_reflect.wasm");
+    static IBC2_CONTRACT: &[u8] = include_bytes!("../testdata/ibc2.wasm");
     static EMPTY_CONTRACT: &[u8] = include_bytes!("../testdata/empty.wasm");
     // Invalid because it doesn't contain required memory and exports
     static INVALID_CONTRACT_WAT: &str = r#"(module
@@ -658,6 +663,17 @@ mod tests {
         }
     }
 
+    fn make_ibc2_testing_options() -> CacheOptions {
+        let mut capabilities = default_capabilities();
+        capabilities.insert("ibc2".into());
+        CacheOptions {
+            base_dir: TempDir::new().unwrap().into_path(),
+            available_capabilities: capabilities,
+            memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+            instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
+        }
+    }
+
     /// Takes an instance and executes it
     fn test_hackatom_instance_execution<S, Q>(instance: &mut Instance<MockApi, S, Q>)
     where
@@ -1444,6 +1460,7 @@ mod tests {
             report1,
             AnalysisReport {
                 has_ibc_entry_points: false,
+                has_ibc2_entry_points: false,
                 entrypoints: BTreeSet::from([
                     E::Instantiate,
                     E::Migrate,
@@ -1465,6 +1482,7 @@ mod tests {
             report2,
             AnalysisReport {
                 has_ibc_entry_points: true,
+                has_ibc2_entry_points: false,
                 entrypoints: ibc_contract_entrypoints,
                 required_capabilities: BTreeSet::from_iter([
                     "iterator".to_string(),
@@ -1480,6 +1498,7 @@ mod tests {
             report3,
             AnalysisReport {
                 has_ibc_entry_points: false,
+                has_ibc2_entry_points: false,
                 entrypoints: BTreeSet::new(),
                 required_capabilities: BTreeSet::from(["iterator".to_string()]),
                 contract_migrate_version: None,
@@ -1499,11 +1518,32 @@ mod tests {
             report4,
             AnalysisReport {
                 has_ibc_entry_points: false,
+                has_ibc2_entry_points: false,
                 entrypoints: BTreeSet::new(),
                 required_capabilities: BTreeSet::from(["iterator".to_string()]),
                 contract_migrate_version: Some(21),
             }
         );
+
+        let cache: Cache<MockApi, MockStorage, MockQuerier> =
+            unsafe { Cache::new(make_ibc2_testing_options()).unwrap() };
+        let checksum5 = cache.store_code(IBC2_CONTRACT, true, true).unwrap();
+        let report5 = cache.analyze(&checksum5).unwrap();
+        let mut ibc2_contract_entrypoints = BTreeSet::from([E::Instantiate, E::Query]);
+        ibc2_contract_entrypoints.extend([REQUIRED_IBC2_EXPORT]);
+        assert_eq!(
+            report5,
+            AnalysisReport {
+                has_ibc_entry_points: false,
+                has_ibc2_entry_points: true,
+                entrypoints: ibc2_contract_entrypoints,
+                required_capabilities: BTreeSet::from_iter([
+                    "iterator".to_string(),
+                    "ibc2".to_string()
+                ]),
+                contract_migrate_version: None,
+            }
+        );
     }
 
     #[test]

packages/vm/src/static_analysis.rs

@@ -58,6 +58,8 @@ pub const REQUIRED_IBC_EXPORTS: &[Entrypoint] = &[
     Entrypoint::IbcPacketTimeout,
 ];
 
+pub const REQUIRED_IBC2_EXPORT: &Entrypoint = &Entrypoint::Ibc2PacketReceive;
+
 /// A trait that allows accessing shared functionality of `parity_wasm::elements::Module`
 /// and `wasmer::Module` in a shared fashion.
 pub trait ExportInfo {