Merge branch 'main' into tkulik/update_wasmer

Author: chipshort

.circleci/config.yml

@@ -80,6 +80,7 @@ workflows:
       - contract_ibc_callbacks
       - contract_ibc_reflect
       - contract_ibc_reflect_send
+      - contract_nested_contracts
       - contract_queue
       - contract_reflect
       - contract_staking
@@ -763,6 +764,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

@@ -40,3 +40,17 @@ jobs:
 
       # 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

@@ -46,6 +46,9 @@ 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])
@@ -54,6 +57,7 @@ and this project adheres to
 
 [#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
 
@@ -771,7 +775,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

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["packages/*"]
 exclude = ["contracts"]
 
-# Resolver has to be set explicitely in workspaces
+# Resolver has to be set explicitly in workspaces
 # due to https://github.com/rust-lang/cargo/issues/9956
 resolver = "2"
 
@@ -11,7 +11,10 @@ version = "2.1.3"
 
 [workspace.dependencies]
 schemars = "0.8.4"
-serde = { version = "1.0.192", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.192", default-features = false, features = [
+    "alloc",
+    "derive",
+] }
 
 [workspace.metadata.release]
 shared-version = true

IBC.md

@@ -25,7 +25,7 @@ pub enum IbcMsg {
     /// We cannot select the port_id, this is whatever the local chain has bound the ibctransfer
     /// module to.
     Transfer {
-        /// exisiting channel to send the tokens over
+        /// existing channel to send the tokens over
         channel_id: String,
         /// address on the remote chain to receive these tokens
         to_address: String,
@@ -385,7 +385,7 @@ produced 3 suggestions on how to handle errors and rollbacks _inside
    `submessage` and capture the error. This approach requires we use _exactly
    one_ submessage. If we have multiple, we may commit #1 and rollback #2 (see
    example 3 for that case). The main point is moving `messages` to
-   `submessages` and reformating the error in `reply`. Note that if you set the
+   `submessages` and reformatting the error in `reply`. Note that if you set the
    `Response.data` field in `reply` it will override the acknowledgement
    returned from the parent call. (See
    [bottom of reply section](./SEMANTICS.md#handling-the-reply)). You can see a

MIGRATING.md

@@ -1342,7 +1342,7 @@ arbitrary ones.
 
 - The block time in `env.block.time` is now a `Timestamp` which stores
   nanosecond precision. `env.block.time_nanos` was removed. If you need the
-  compnents as before, use
+  components as before, use
   ```rust
   let seconds = env.block.time.nanos() / 1_000_000_000;
   let nsecs = env.block.time.nanos() % 1_000_000_000;
@@ -1456,7 +1456,7 @@ arbitrary ones.
 - Contracts now support any custom error type `E: ToString + From<StdError>`.
   Previously this has been `StdError`, which you can still use. However, you can
   now create a much more structured error experience for your unit tests that
-  handels exactly the error cases of your contract. In order to get a convenient
+  handles exactly the error cases of your contract. In order to get a convenient
   implementation for `ToString` and `From<StdError>`, we use the crate
   [thiserror](https://crates.io/crates/thiserror), which needs to be added to
   the contracts dependencies in `Cargo.toml`. To create the custom error, create
@@ -1492,8 +1492,8 @@ arbitrary ones.
   - `fn handle`: `Result<HandleResponse, MyCustomError>`,
   - `fn query`: `Result<Binary, MyCustomError>`.
 
-  If one of your funtions does not use the custom error, you can continue to use
-  `StdError` as before. I.e. you can have `handle` returning
+  If one of your functions does not use the custom error, you can continue to
+  use `StdError` as before. I.e. you can have `handle` returning
   `Result<HandleResponse, MyCustomError>` and `query` returning
   `StdResult<Binary>`.