Merge pull request CosmWasm#1701 from CosmWasm/w4

Update to wasmer 4
terra-money · Jun 27, 2023 · f2443f8 · f2443f8
2 parents 7943fa8 + afc610a
commit f2443f8
Show file tree

Hide file tree

Showing 91 changed files with 689 additions and 661 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.64.0
+          toolchain: 1.67.0
           target: wasm32-unknown-unknown
           profile: minimal
           override: true

diff --git a/.mergify.yml b/.mergify.yml
@@ -13,7 +13,7 @@ pull_request_rules:
       - "status-success=macOS"
       - "status-success=Windows"
       - "status-success=ci/circleci: arm64"
-      - "status-success=ci/circleci: clippy-1.60.0"
+      - "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"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,7 +42,7 @@ and this project adheres to
 - 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: Add `.wasm` extension to stored wasm files ([#1686]).
-- cosmwasm-vm: Upgrade Wasmer to version 3.3.0.
+- cosmwasm-vm: Upgrade Wasmer to version 4.0.0.
 - cosmwasm-check: Update clap dependency to version 4 ([#1677])
 - cosmwasm-std: Coin uses shorter `Coin { 123 "ucosm" }` format for Debug
   ([#1704])

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
diff --git a/contracts/crypto-verify/src/contract.rs b/contracts/crypto-verify/src/contract.rs
@@ -396,7 +396,7 @@ mod tests {
                 source: RecoverPubkeyError::UnknownErr { .. },
                 ..
             } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 

diff --git a/contracts/crypto-verify/src/ethereum.rs b/contracts/crypto-verify/src/ethereum.rs
@@ -88,8 +88,7 @@ pub fn get_recovery_param_with_chain_id(v: u64, chain_id: u64) -> StdResult<u8>
     match recovery {
         0 | 1 => Ok(recovery as u8),
         _ => Err(StdError::generic_err(format!(
-            "Calculated recovery parameter must be 0 or 1 but is {}.",
-            recovery
+            "Calculated recovery parameter must be 0 or 1 but is {recovery}."
         ))),
     }
 }