Merge branch 'main' into merge-1-3

CosmWasm · Aug 22, 2023 · 8b2e4c8 · 8b2e4c8
2 parents 7cb25b4 + ebb3785
commit 8b2e4c8
Show file tree

Hide file tree

Showing 167 changed files with 10,023 additions and 7,942 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.65.0
+          toolchain: 1.67.0
           target: wasm32-unknown-unknown
           profile: minimal
           override: true

diff --git a/.mergify.yml b/.mergify.yml
@@ -6,27 +6,50 @@ pull_request_rules:
       - "#approved-reviews-by>=1"
       - base=main
       - label=automerge
+      - -draft
       - label!=WIP
-      # We need to list them all individually. Here is why: https://doc.mergify.io/conditions.html#validating-all-status-check
-      - "status-success=ci/circleci: package_crypto"
-      - "status-success=ci/circleci: package_schema"
-      - "status-success=ci/circleci: package_std"
-      - "status-success=ci/circleci: package_storage"
-      - "status-success=ci/circleci: package_vm"
+      # We need to list them all individually. Here is why: https://docs.mergify.com/conditions/#validating-all-status-checks
+      # Also make sure to update this when the CI names change
+      - "status-success=macOS"
+      - "status-success=Windows"
+      - "status-success=ci/circleci: arm64"
+      - "status-success=ci/circleci: clippy-1.67.0"
+      - "status-success=ci/circleci: clippy-1.68.2"
       - "status-success=ci/circleci: contract_burner"
       - "status-success=ci/circleci: contract_crypto_verify"
+      - "status-success=ci/circleci: contract_cyberpunk"
+      - "status-success=ci/circleci: contract_floaty"
+      - "status-success=ci/circleci: contract_hackatom"
       - "status-success=ci/circleci: contract_hackatom"
       - "status-success=ci/circleci: contract_ibc_reflect"
       - "status-success=ci/circleci: contract_ibc_reflect_send"
-      - "status-success=ci/circleci: contract_floaty"
       - "status-success=ci/circleci: contract_queue"
       - "status-success=ci/circleci: contract_reflect"
       - "status-success=ci/circleci: contract_staking"
+      - "status-success=ci/circleci: contract_virus"
+      # disabled temporarily because Rust version is too low
+      # - "status-success=ci/circleci: coverage"
       - "status-success=ci/circleci: fmt"
-      - "status-success=ci/circleci: clippy-1.54.0"
-      - "status-success=ci/circleci: clippy-1.58.1"
-      - "status-success=Windows"
-      - "status-success=macOS"
+      - "status-success=ci/circleci: fmt_extra"
+      - "status-success=ci/circleci: package_check"
+      - "status-success=ci/circleci: package_crypto"
+      - "status-success=ci/circleci: package_schema"
+      - "status-success=ci/circleci: package_schema_derive"
+      - "status-success=ci/circleci: package_std"
+      - "status-success=ci/circleci: package_storage"
+      - "status-success=ci/circleci: package_vm"
+      - "status-success=ci/circleci: package_vm_windows"
     actions:
       merge:
         method: merge
+  - name: backport PRs to minor version branch
+    conditions:
+      - base=main
+      - label=backport
+    actions:
+      backport:
+        branches:
+          # Update this when going to a new minor version
+          - "release/1.4"
+        assignees:
+          - "{{ author }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,37 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Added
+
+- cosmwasm-std: Implement `Not` for `Uint{64,128,256}` ([#1799]).
+- cosmwasm-std: Add iterators for `Coins` ([#1806]).
+
+[#1799]: https://github.com/CosmWasm/cosmwasm/pull/1799
+[#1806]: https://github.com/CosmWasm/cosmwasm/pull/1806
+
+### Changed
+
+- cosmwasm-vm: Avoid using loupe for getting the `Module` size in the file
+  system cache to prepare for the Wasmer 3 upgrade.
+- cosmwasm-vm: When enabling `print_debug` the debug logs are now printed to
+  STDERR instead of STDOUT by default ([#1667]).
+- cosmwasm-vm: Add `Instance::set_debug_handler`/`unset_debug_handler` to allow
+  customizing the handling of debug messages emitted by the contract ([#1667]).
+- cosmwasm-vm: Upgrade Wasmer to version 4.1. ([#1674], [#1693], [#1701],
+  [#1793])
+- cosmwasm-check: Update clap dependency to version 4 ([#1677])
+- cosmwasm-vm: Use `wasmparser` for initial validation instead of `parity-wasm`
+  ([#1786])
+- cosmwasm-std: Make constructors `Decimal{,256}::{percent,permille,bps}` const
+
+[#1667]: https://github.com/CosmWasm/cosmwasm/pull/1667
+[#1674]: https://github.com/CosmWasm/cosmwasm/pull/1674
+[#1677]: https://github.com/CosmWasm/cosmwasm/pull/1677
+[#1693]: https://github.com/CosmWasm/cosmwasm/pull/1693
+[#1701]: https://github.com/CosmWasm/cosmwasm/pull/1701
+[#1786]: https://github.com/CosmWasm/cosmwasm/pull/1786
+[#1793]: https://github.com/CosmWasm/cosmwasm/pull/1793
+
 ## [1.3.3] - 2023-08-22
 
 ### Added
@@ -89,6 +120,13 @@ and this project adheres to
 [#1664]: https://github.com/CosmWasm/cosmwasm/pull/1664
 [#1686]: https://github.com/CosmWasm/cosmwasm/pull/1686
 
+### Deprecated
+
+- cosmwasm-storage: All exports are deprecated because this crate will be
+  removed with CosmWasm 2.0 ([#1596]).
+
+[#1596]: https://github.com/CosmWasm/cosmwasm/issues/1596
+
 ## [1.2.7] - 2023-06-19
 
 ### Added