Merge branch 'main' into aw/new-schema

CosmWasm · Feb 10, 2025 · 4f70890 · 4f70890
2 parents 2a367ae + 1cd820c
commit 4f70890
Show file tree

Hide file tree

Showing 104 changed files with 3,098 additions and 1,791 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -79,6 +79,7 @@ workflows:
       - contract_crypto_verify
       - contract_cyberpunk
       - contract_empty
+      - contract_replier
       # - contract_floaty # This contract needs nightly Rust to compile
       - contract_hackatom
       - contract_ibc_callbacks
@@ -95,7 +96,7 @@ workflows:
           matrix:
             parameters:
               # Run with MSRV and some modern stable Rust
-              rust-version: ["1.74.0", "1.82.0"]
+              rust-version: ["1.74.0", "1.78.0"]
       - benchmarking:
           requires:
             - package_vm
@@ -597,6 +598,34 @@ jobs:
             - target/wasm32-unknown-unknown/release/deps
           key: cargocache-v2-contract_burner-rust:1.74-{{ checksum "Cargo.lock" }}
 
+  contract_replier:
+    docker:
+      - image: rust:1.74
+    environment:
+      RUST_BACKTRACE: 1
+    working_directory: ~/cosmwasm/contracts/replier
+    steps:
+      - checkout:
+          path: ~/cosmwasm
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version
+      - restore_cache:
+          keys:
+            - cargocache-v2-contract_replier-rust:1.74-{{ 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_replier-rust:1.74-{{ checksum "Cargo.lock" }}
+
   contract_crypto_verify:
     docker:
       - image: rust:1.74
@@ -655,8 +684,7 @@ jobs:
 
   contract_hackatom:
     docker:
-      # We compile this contract with the upper bound to detect issues with new Rust versions early
-      - image: rust:1.82
+      - image: rust:1.74
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/hackatom
@@ -668,7 +696,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_hackatom-rust:1.82-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }}
       - check_contract:
           min_version: "2.2"
       - save_cache:
@@ -680,7 +708,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.82-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }}
 
   contract_ibc_callbacks:
     docker:
@@ -994,7 +1022,9 @@ jobs:
       - checkout
       - run:
           name: Install shfmt
-          command: curl -sS https://webinstall.dev/shfmt | bash
+          command: |
+            wget -O install_shfmt.sh https://webinstall.dev/shfmt
+            bash install_shfmt.sh
       - run:
           name: Validate Markdown files
           command: devtools/format_md.sh -c
@@ -1091,7 +1121,8 @@ jobs:
       - run:
           name: Clippy linting on std (all feature flags)
           working_directory: ~/project/packages/std
-          command: cargo clippy --all-targets --tests --all-features -- -D warnings
+          # change to --all-features once `abort` is removed
+          command: cargo clippy --all-targets --tests --features staking,stargate,cosmwasm_2_2 -- -D warnings
       - run:
           name: Clippy linting on vm (no feature flags)
           working_directory: ~/project/packages/vm
@@ -1143,7 +1174,7 @@ jobs:
 
   coverage:
     docker:
-      - image: rust:1.82.0-alpine3.19
+      - image: rust:1.78.0-alpine3.19
     environment:
       # Limit the number of parallel jobs to avoid OOM crashes during doc testing
       RUST_TEST_THREADS: 8

diff --git a/.github/workflows/typo-check.yml b/.github/workflows/typo-check.yml
@@ -15,5 +15,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - id: files
+        uses: tj-actions/changed-files@v45
       - name: Run spell-check
         uses: crate-ci/typos@master
+        with:
+          files: ${{ steps.files.outputs.all_changed_files }}
diff --git a/.taplo.toml b/.taplo.toml
@@ -1,3 +1,2 @@
 [formatting]
 indent_string = "    "
-reorder_arrays = true
diff --git a/CHANGELOG-pre1.0.0.md b/CHANGELOG-pre1.0.0.md
@@ -460,7 +460,7 @@ and this project adheres to
   secp256k1 signature verification scheme for Cosmos signature and public key
   formats. ([#780])
 - cosmwasm-vm: Add PinnedMemoryCache. ([#696])
-- cosmwasm-vm: The new `Cache::analyze` provides a static analyzis of the Wasm
+- cosmwasm-vm: The new `Cache::analyze` provides a static analysis of the Wasm
   bytecode. This is used to tell the caller if the contract exposes IBC entry
   points. ([#736])
 - cosmwasm-vm: Added new `stargate` feature flag to enable new stargate and ibc