Merge branch 'main' into aw/new-schema

aumetra · aumetra · commit 63d647d420f2 · 2024-10-24T13:13:15.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,7 +35,10 @@ commands:
             - run:
                 name: Run cosmwasm-check (<< parameters.min_version >>)
                 command: |
-                  cargo install cosmwasm-check@~<< parameters.min_version >> --locked --force
+                  # Try installing min_version, but fall back to latest main version.
+                  # This allows us to test contracts against the latest cosmwasm-check before releasing it.
+                  cargo install cosmwasm-check@~<< parameters.min_version >> --locked --force \
+                  || cargo install --path ../../packages/check --locked --force
                   cosmwasm-check --version
                   cosmwasm-check target/wasm32-unknown-unknown/release/*.wasm
       # Run clippy after wasm build to ensure target/wasm32-unknown-unknown/release/<contract>.wasm exists
@@ -92,7 +95,7 @@ workflows:
           matrix:
             parameters:
               # Run with MSRV and some modern stable Rust
-              rust-version: ["1.74.0", "1.78.0"]
+              rust-version: ["1.74.0", "1.82.0"]
       - benchmarking:
           requires:
             - package_vm
@@ -652,7 +655,8 @@ jobs:
 
   contract_hackatom:
     docker:
-      - image: rust:1.74
+      # We compile this contract with the upper bound to detect issues with new Rust versions early
+      - image: rust:1.82
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/hackatom
@@ -664,10 +668,9 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_hackatom-rust:1.82-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
-          skip_cosmwasm_check: true
+          min_version: "2.2"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -677,7 +680,7 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_hackatom-rust:1.82-{{ checksum "Cargo.lock" }}
 
   contract_ibc_callbacks:
     docker:
@@ -722,10 +725,8 @@ jobs:
       - restore_cache:
           keys:
             - cargocache-v2-contract_ibc_reflect-rust:1.74-{{ checksum "Cargo.lock" }}
-      # TODO: enable again once 2.2 is released
       - check_contract:
           min_version: "2.2"
-          skip_cosmwasm_check: true
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -864,10 +865,8 @@ jobs:
       - restore_cache:
           keys:
             - cargocache-v2-contract_reflect-rust:1.74-{{ checksum "Cargo.lock" }}
-      # TODO: enable again once 2.2 is released
       - check_contract:
           min_version: "2.2"
-          skip_cosmwasm_check: true
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -1144,7 +1143,7 @@ jobs:
 
   coverage:
     docker:
-      - image: rust:1.78.0-alpine3.19
+      - image: rust:1.82.0-alpine3.19
     environment:
       # Limit the number of parallel jobs to avoid OOM crashes during doc testing
       RUST_TEST_THREADS: 8
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,11 +26,14 @@ and this project adheres to
 - cosmwasm-vm: Export a new `migrate_with_info` function ([#2212])
 - cosmwasm-derive: Add support for migrate method with
   `migrate_info: MigrateInfo` argument. ([#2212])
+- cosmwasm-vm: Enable support for reference-types proposal, required since Rust
+  1.82 ([#2288])
 
 [#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
+[#2288]: https://github.com/CosmWasm/cosmwasm/pull/2288
 
 ### Changed
 
@@ -48,7 +51,12 @@ and this project adheres to
   match the contract address from `mock_env`. ([#2211])
 - cosmwasm-derive: Automatically detect whether the package is a dependency or
   the primary package, only expanding entrypoints for the primary package. This
-  effectively deprecates the usage of the `library` feature pattern. ([#2246])
+  effectively deprecates the usage of the `library` feature pattern.
+
+  Note: This feature does **NOT** interact well with workspaces due to a cargo
+  bug. If you have multiple contracts in a workspace, you might still want to
+  use the library feature ([#2246])
+
 - cosmwasm-std: Deprecate `BankQuery::AllBalances` and `IbcQuery::ListChannels`.
   Both are inherently problematic to use because the returned entries are
   unbounded. ([#2247])
diff --git a/packages/check/tests/cosmwasm_check_tests.rs b/packages/check/tests/cosmwasm_check_tests.rs
@@ -103,7 +103,7 @@ fn wasm_limits_string_check() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("cosmwasm-check")?;
 
     let mut limits = WasmLimits::default();
-    limits.initial_memory_limit = Some(10);
+    limits.initial_memory_limit_pages = Some(10);
 
     cmd.arg("--wasm-limits")
         .arg(to_json_string(&limits).unwrap())
diff --git a/packages/vm/benches/main.rs b/packages/vm/benches/main.rs
@@ -386,7 +386,7 @@ fn bench_combined(c: &mut Criterion) {
 
     group.bench_function("get instance from fs cache and execute", |b| {
         let mut non_memcache = options.clone();
-        non_memcache.memory_cache_size = Size::kibi(0);
+        non_memcache.memory_cache_size_bytes = Size::kibi(0);
 
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(non_memcache).unwrap() };
diff --git a/packages/vm/src/cache.rs b/packages/vm/src/cache.rs
@@ -142,8 +142,8 @@ where
                 CacheOptions {
                     base_dir,
                     available_capabilities,
-                    memory_cache_size,
-                    instance_memory_limit,
+                    memory_cache_size_bytes,
+                    instance_memory_limit_bytes,
                 },
             wasm_limits,
         } = config;
@@ -165,11 +165,11 @@ where
             inner: Mutex::new(CacheInner {
                 wasm_path,
                 pinned_memory_cache: PinnedMemoryCache::new(),
-                memory_cache: InMemoryCache::new(memory_cache_size),
+                memory_cache: InMemoryCache::new(memory_cache_size_bytes),
                 fs_cache,
                 stats: Stats::default(),
             }),
-            instance_memory_limit,
+            instance_memory_limit: instance_memory_limit_bytes,
             type_storage: PhantomData::<S>,
             type_api: PhantomData::<A>,
             type_querier: PhantomData::<Q>,
@@ -614,8 +614,8 @@ mod tests {
         CacheOptions {
             base_dir: TempDir::new().unwrap().into_path(),
             available_capabilities: default_capabilities(),
-            memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
-            instance_memory_limit: TESTING_MEMORY_LIMIT,
+            memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+            instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
         }
     }
 
@@ -625,8 +625,8 @@ mod tests {
         CacheOptions {
             base_dir: TempDir::new().unwrap().into_path(),
             available_capabilities: capabilities,
-            memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
-            instance_memory_limit: TESTING_MEMORY_LIMIT,
+            memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+            instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
         }
     }
 
@@ -755,8 +755,8 @@ mod tests {
             let options1 = CacheOptions {
                 base_dir: tmp_dir.path().to_path_buf(),
                 available_capabilities: default_capabilities(),
-                memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
-                instance_memory_limit: TESTING_MEMORY_LIMIT,
+                memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+                instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
             };
             let cache1: Cache<MockApi, MockStorage, MockQuerier> =
                 unsafe { Cache::new(options1).unwrap() };
@@ -767,8 +767,8 @@ mod tests {
             let options2 = CacheOptions {
                 base_dir: tmp_dir.path().to_path_buf(),
                 available_capabilities: default_capabilities(),
-                memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
-                instance_memory_limit: TESTING_MEMORY_LIMIT,
+                memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+                instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
             };
             let cache2: Cache<MockApi, MockStorage, MockQuerier> =
                 unsafe { Cache::new(options2).unwrap() };
@@ -800,8 +800,8 @@ mod tests {
         let options = CacheOptions {
             base_dir: tmp_dir.path().to_path_buf(),
             available_capabilities: default_capabilities(),
-            memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
-            instance_memory_limit: TESTING_MEMORY_LIMIT,
+            memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+            instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options).unwrap() };
@@ -1606,8 +1606,8 @@ mod tests {
         let options = CacheOptions {
             base_dir: tmp_dir.path().to_path_buf(),
             available_capabilities: default_capabilities(),
-            memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
-            instance_memory_limit: TESTING_MEMORY_LIMIT,
+            memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+            instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options).unwrap() };
@@ -1639,8 +1639,8 @@ mod tests {
             cache: CacheOptions {
                 base_dir: tmp_dir.path().to_path_buf(),
                 available_capabilities: default_capabilities(),
-                memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
-                instance_memory_limit: TESTING_MEMORY_LIMIT,
+                memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
+                instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
             },
         };
 
diff --git a/packages/vm/src/compatibility.rs b/packages/vm/src/compatibility.rs
@@ -122,7 +122,7 @@ fn check_wasm_tables(module: &ParsedWasm, wasm_limits: &WasmLimits) -> VmResult<
         1 => {
             let limits = &module.tables[0];
             if let Some(maximum) = limits.maximum {
-                if maximum > wasm_limits.table_size_limit() {
+                if maximum > wasm_limits.table_size_limit_elements() {
                     return Err(VmError::static_validation_err(
                         "Wasm contract's first table section has a too large max limit",
                     ));
@@ -148,10 +148,10 @@ fn check_wasm_memories(module: &ParsedWasm, limits: &WasmLimits) -> VmResult<()>
     }
     let memory = &module.memories[0];
 
-    if memory.initial > limits.initial_memory_limit() as u64 {
+    if memory.initial > limits.initial_memory_limit_pages() as u64 {
         return Err(VmError::static_validation_err(format!(
             "Wasm contract memory's minimum must not exceed {} pages.",
-            limits.initial_memory_limit()
+            limits.initial_memory_limit_pages()
         )));
     }
 
diff --git a/packages/vm/src/config.rs b/packages/vm/src/config.rs
@@ -52,7 +52,7 @@ pub struct WasmLimits {
     ///
     /// Every Wasm memory has an initial size and an optional maximum size,
     /// both measured in Wasm pages. This limit applies to the initial size.
-    pub initial_memory_limit: Option<u32>,
+    pub initial_memory_limit_pages: Option<u32>,
     /// The upper limit for the `max` value of each table. CosmWasm contracts have
     /// initial=max for 1 table. See
     ///
@@ -64,7 +64,7 @@ pub struct WasmLimits {
     /// - table[0] type=funcref initial=161 max=161
     /// ```
     ///
-    pub table_size_limit: Option<u32>,
+    pub table_size_limit_elements: Option<u32>,
     /// If the contract has more than this amount of imports, it will be rejected
     /// during static validation before even looking into the imports.
     pub max_imports: Option<usize>,
@@ -88,12 +88,14 @@ pub struct WasmLimits {
 }
 
 impl WasmLimits {
-    pub fn initial_memory_limit(&self) -> u32 {
-        self.initial_memory_limit.unwrap_or(DEFAULT_MEMORY_LIMIT)
+    pub fn initial_memory_limit_pages(&self) -> u32 {
+        self.initial_memory_limit_pages
+            .unwrap_or(DEFAULT_MEMORY_LIMIT)
     }
 
-    pub fn table_size_limit(&self) -> u32 {
-        self.table_size_limit.unwrap_or(DEFAULT_TABLE_SIZE_LIMIT)
+    pub fn table_size_limit_elements(&self) -> u32 {
+        self.table_size_limit_elements
+            .unwrap_or(DEFAULT_TABLE_SIZE_LIMIT)
     }
 
     pub fn max_imports(&self) -> usize {
@@ -130,24 +132,24 @@ pub struct CacheOptions {
     pub base_dir: PathBuf,
     pub available_capabilities: HashSet<String>,
     /// Memory limit for the cache, in bytes.
-    pub memory_cache_size: Size,
+    pub memory_cache_size_bytes: Size,
     /// Memory limit for instances, in bytes. Use a value that is divisible by the Wasm page size 65536,
     /// e.g. full MiBs.
-    pub instance_memory_limit: Size,
+    pub instance_memory_limit_bytes: Size,
 }
 
 impl CacheOptions {
     pub fn new(
         base_dir: impl Into<PathBuf>,
         available_capabilities: impl Into<HashSet<String>>,
-        memory_cache_size: Size,
-        instance_memory_limit: Size,
+        memory_cache_size_bytes: Size,
+        instance_memory_limit_bytes: Size,
     ) -> Self {
         Self {
             base_dir: base_dir.into(),
             available_capabilities: available_capabilities.into(),
-            memory_cache_size,
-            instance_memory_limit,
+            memory_cache_size_bytes,
+            instance_memory_limit_bytes,
         }
     }
 }
diff --git a/packages/vm/src/parsed_wasm.rs b/packages/vm/src/parsed_wasm.rs
@@ -79,7 +79,7 @@ impl<'a> ParsedWasm<'a> {
             multi_value: true,
             floats: true,
 
-            reference_types: false,
+            reference_types: true,
             bulk_memory: false,
             simd: false,
             relaxed_simd: false,
diff --git a/packages/vm/src/wasm_backend/gatekeeper.rs b/packages/vm/src/wasm_backend/gatekeeper.rs
@@ -59,7 +59,7 @@ impl Default for Gatekeeper {
         Self::new(GatekeeperConfig {
             allow_floats: true,
             allow_feature_bulk_memory_operations: false,
-            allow_feature_reference_types: false,
+            allow_feature_reference_types: true,
             allow_feature_simd: false,
             allow_feature_exception_handling: false,
             allow_feature_threads: false,
