Merge branch 'main' into aw/new-schema

Author: aumetra

.circleci/config.yml

@@ -70,6 +70,7 @@ workflows:
       - package_schema_derive
       - package_std
       - package_vm
+      - package_vm_derive
       - package_vm_windows
       - contract_burner
       - contract_crypto_verify
@@ -80,6 +81,7 @@ workflows:
       - contract_ibc_callbacks
       - contract_ibc_reflect
       - contract_ibc_reflect_send
+      - contract_nested_contracts
       - contract_queue
       - contract_reflect
       - contract_staking
@@ -492,6 +494,34 @@ jobs:
             - target/debug/deps
           key: cargocache-v2-package_vm-rust:1.74-{{ checksum "Cargo.lock" }}
 
+  package_vm_derive:
+    docker:
+      - image: rust:1.74
+    steps:
+      - checkout
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version; rustup target list --installed
+      - restore_cache:
+          keys:
+            - cargocache-v2-package_vm_derive-rust:1.74-{{ checksum "Cargo.lock" }}
+      - run:
+          name: Build
+          working_directory: ~/project/packages/vm-derive
+          command: cargo build --locked
+      - run:
+          name: Test
+          working_directory: ~/project/packages/vm-derive
+          command: cargo test --locked
+
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target/debug/.fingerprint
+            - target/debug/build
+            - target/debug/deps
+          key: cargocache-v2-package_vm_derive-rust:1.74-{{ checksum "Cargo.lock" }}
+
   package_vm_windows:
     executor:
       name: win/default
@@ -637,6 +667,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
@@ -762,6 +793,34 @@ jobs:
             - target/wasm32-unknown-unknown/release/deps
           key: cargocache-v2-contract_floaty-rust:1.74-{{ checksum "Cargo.lock" }}
 
+  contract_nested_contracts:
+    docker:
+      - image: rust:1.75
+    environment:
+      RUST_BACKTRACE: 1
+    working_directory: ~/cosmwasm/contracts/nested-contracts
+    steps:
+      - checkout:
+          path: ~/cosmwasm
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version
+      - restore_cache:
+          keys:
+            - cargocache-v2-contract_nested_contracts-rust:1.75-{{ checksum "Cargo.lock" }}
+      - check_contract:
+          min_version: "1.4"
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target/debug/.fingerprint
+            - target/debug/build
+            - target/debug/deps
+            - target/wasm32-unknown-unknown/release/.fingerprint
+            - target/wasm32-unknown-unknown/release/build
+            - target/wasm32-unknown-unknown/release/deps
+          key: cargocache-v2-contract_nested_contracts-rust:1.75-{{ checksum "Cargo.lock" }}
+
   contract_queue:
     docker:
       - image: rust:1.74

.github/workflows/autofix.yml

@@ -29,3 +29,28 @@ jobs:
 
       # Get latest version from https://autofix.ci/setup
       - uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a
+
+  autofix-schemas:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Update schemas
+        run: ./devtools/update_schemas.sh
+
+      # Get latest version from https://autofix.ci/setup
+      - uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a
+
+  autofix-toml:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install taplo
+        run: |
+          curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-full-linux-x86_64.gz \
+            | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
+      - run: |
+          taplo fmt
+
+      # Get latest version from https://autofix.ci/setup
+      - uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a

.github/workflows/toml.yml

@@ -0,0 +1,26 @@
+name: "TOML checks"
+
+on:
+  merge_group:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  fmt-check:
+    name: "Formatting"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install taplo
+        run: |
+          curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-full-linux-x86_64.gz \
+            | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
+      - run: |
+          taplo fmt
+          CHANGES_IN_REPO=$(git status --porcelain)
+          if [[ -n "$CHANGES_IN_REPO" ]]; then
+              exit 1
+          fi

.github/workflows/typo-check.yml

@@ -0,0 +1,19 @@
+name: Check for typos
+
+on:
+  merge_group:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  check-typos:
+    name: "Spell-check repository source"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run spell-check
+        uses: crate-ci/typos@master

.taplo.toml

@@ -0,0 +1,3 @@
+[formatting]
+indent_string = "    "
+reorder_arrays = true

CHANGELOG-pre1.0.0.md

@@ -738,7 +738,7 @@ and this project adheres to
   with this change, the `backtraces` feature now requires Rust nightly.
 - Rename `StdError::ParseErr::source` to `StdError::ParseErr::source_type` and
   `StdError::SerializeErr::target` to `StdError::SerializeErr::target_type` to
-  work around speacial treatment of the field name `source` in thiserror.
+  work around special treatment of the field name `source` in thiserror.
 - Rename `Extern` to `Deps` to unify naming.
 - Simplify ownership of calling `handle`, etc. with `Deps` and `DepsMut` struct
   that just contains references (`DepsMut` has `&mut Storage` otherwise the
@@ -1259,7 +1259,7 @@ https://github.com/CosmWasm/cosmwasm/issues/451).
   for mock storage and copying a stateless bridge for the external storage,
   which are different semantics.
 - Remove public `cosmwasm::imports::dependencies`. A user of this library does
-  not need to call this explicitely. Dependencies are created internally and
+  not need to call this explicitly. Dependencies are created internally and
   passed as an argument in `exports::do_init`, `exports::do_handle` and
   `exports::do_query`.
 - Make `ExternalStorage` not `Clone`able anymore. This does not copy any data,

CHANGELOG.md

@@ -17,9 +17,20 @@ and this project adheres to
 - cosmwasm-std: Add `IbcMsg::{PayPacketFee, PayPacketFeeAsync}` and
   `IbcQuery::FeeEnabledChannel` to allow contracts to incentivize IBC packets
   using IBC Fees. ([#2196])
+- cosmwasm-vm: Add `Config` that allows to configure the limits for static Wasm
+  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
 
@@ -35,9 +46,27 @@ and this project adheres to
 - cosmwasm-vm: Let `mock_env` return a contract address that is valid bech32 and
   uses the same bech32 prefix as `MockApi`; Change `MOCK_CONTRACT_ADDR` value 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])
+- cosmwasm-std: Deprecate `BankQuery::AllBalances` and `IbcQuery::ListChannels`.
+  Both are inherently problematic to use because the returned entries are
+  unbounded. ([#2247])
+- cosmwasm-vm: Upgrade Wasmer to 4.3.7; Bump `MODULE_SERIALIZATION_VERSION` to
+  "v20". ([#2255])
+- cosmwasm-vm: Effectively remove the `cranelift` feature. It still exists but
+  is only a no-op for semver compatibility. It will now unconditionally use the
+  singlepass compiler. ([#2260])
+- cosmwasm-vm: Automatically derive cache version from function hashes and the
+  Wasmer version ([#2250])
 
 [#2118]: https://github.com/CosmWasm/cosmwasm/pull/2118
 [#2211]: https://github.com/CosmWasm/cosmwasm/issues/2211
+[#2246]: https://github.com/CosmWasm/cosmwasm/pull/2246
+[#2247]: https://github.com/CosmWasm/cosmwasm/pull/2247
+[#2255]: https://github.com/CosmWasm/cosmwasm/pull/2255
+[#2260]: https://github.com/CosmWasm/cosmwasm/pull/2260
+[#2250]: https://github.com/CosmWasm/cosmwasm/pull/2250
 
 ## [2.1.3] - 2024-08-08
 
@@ -753,7 +782,7 @@ and this project adheres to
 - all: Bump a few dependency versions to make the codebase compile with
   `-Zminimal-versions` ([#1465]).
 - cosmwasm-profiler: Package was removed 🪦. It served its job showing us that
-  we cannot properly measure different runtimes for differet Wasm opcodes.
+  we cannot properly measure different runtimes for different Wasm opcodes.
 - cosmwasm-schema: schema generation is now locked to produce strictly
   `draft-07` schemas
 - cosmwasm-schema: `QueryResponses` derive now sets the `JsonSchema` trait bound