diff --git a/.editorconfig b/.editorconfig
index c1e2c643..4b0d3a35 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,8 +5,10 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
-end_of_line = lf
+indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.rs]
+indent_size = 4
diff --git a/.github/workflows/Basic.yml b/.github/workflows/Basic.yml
index 9035d61f..ca38b67d 100644
--- a/.github/workflows/Basic.yml
+++ b/.github/workflows/Basic.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.40.0
+          toolchain: 1.59.0
           target: wasm32-unknown-unknown
           override: true
 
@@ -50,7 +50,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.49.0
+          toolchain: 1.59.0
           override: true
           components: rustfmt, clippy
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fda35677..85001393 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,14 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+### Changed
+
+- Bump min supported Rust version to 1.59.0 (same as cosmwasm-std)
+- Upgrade codebase to Rust edition 2021
+
 ## [0.4.1] - 2022-05-05
 
 ### Changed
+
 - Properly serialize `u128`/`i128` types when embedded in structs
 
 ## [0.4.0] - 2022-03-29
 
 ### Added
+
 - Add support for `#[serde(untagged)]` enums representation
 
 ## [0.3.1] - 2021-01-19
@@ -26,6 +35,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 Maintenance release:
+
 - Update clippy version in CI to 1.49.0.
 - Fix `clippy::manual-non-exhaustive` warnings.
 
diff --git a/Cargo.toml b/Cargo.toml
index 5ffafaf8..48b66ec7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ authors = [
 categories = ["wasm"]
 description = "serde_json for Wasm programs (small, deterministic, no floats)"
 documentation = "https://docs.rs/serde-json-wasm"
-edition = "2018"
+edition = "2021"
 keywords = ["serde", "json", "wasm"]
 license = "MIT OR Apache-2.0"
 name = "serde-json-wasm"