Merge pull request #2420 from CosmWasm/avoid-serde_json_wasm

Remove serde-json-wasm dependency

Author: webmaster128

.circleci/config.yml

@@ -604,7 +604,7 @@ jobs:
           keys:
             - cargocache-v2-contract_burner-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -632,7 +632,7 @@ jobs:
           keys:
             - cargocache-v2-contract_replier-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -829,7 +829,7 @@ jobs:
           keys:
             - cargocache-v2-contract_ibc_reflect_send-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -857,7 +857,7 @@ jobs:
           keys:
             - cargocache-v2-contract_floaty-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -885,7 +885,7 @@ jobs:
           keys:
             - cargocache-v2-contract_nested_contracts-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -913,7 +913,7 @@ jobs:
           keys:
             - cargocache-v2-contract_queue-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -969,7 +969,7 @@ jobs:
           keys:
             - cargocache-v2-contract_staking-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry
@@ -997,7 +997,7 @@ jobs:
           keys:
             - cargocache-v2-contract_virus-rust:1.81-{{ checksum "Cargo.lock" }}
       - check_contract:
-          min_version: "1.4"
+          min_version: "1.5"
       - save_cache:
           paths:
             - /usr/local/cargo/registry

CHANGELOG.md

@@ -58,6 +58,8 @@ and this project adheres to
 - cosmwasm-std: Remove previously deprecated `cosmwast_std::testing::mock_info`.
   Use `cosmwasm_std::testing::message_info` instead. ([#2393])
 - cosmwasm-std: Remove abort feature. ([#2141])
+- cosmwasm-std: Replace dependency `serde-json-wasm` with `serde_json`.
+  ([#2195])
 
 ## Fixed
 
@@ -68,6 +70,7 @@ and this project adheres to
 [#2141]: https://github.com/CosmWasm/cosmwasm/issues/2141
 [#2155]: https://github.com/CosmWasm/cosmwasm/issues/2155
 [#2156]: https://github.com/CosmWasm/cosmwasm/issues/2156
+[#2195]: https://github.com/CosmWasm/cosmwasm/issues/2195
 [#2201]: https://github.com/CosmWasm/cosmwasm/issues/2201
 [#2237]: https://github.com/CosmWasm/cosmwasm/issues/2237
 [#2262]: https://github.com/CosmWasm/cosmwasm/issues/2262

Cargo.lock

@@ -435,9 +435,7 @@ fn execute_allocate_large_memory() {
     // Gas consumption is relatively small
     // Note: the exact gas usage depends on the Rust version used to compile Wasm,
     // which we only fix when using rust-optimizer, not integration tests.
-    let expected = 12162675; // +/- 20%
-    assert!(gas_used > expected * 80 / 100, "Gas used: {gas_used}");
-    assert!(gas_used < expected * 120 / 100, "Gas used: {gas_used}");
+    assert_approx_eq!(gas_used, 8623090, "0.2");
     let used = deps.memory_pages();
     assert_eq!(used, pages_before, "Memory used: {used} pages");
 }