diff --git a/Cargo.toml b/Cargo.toml
index b4b26e16..c8e43720 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ keywords = [ "crypto", "grin", "mimblewimble" ]
 readme = "README.md"
 exclude = ["**/*.grin", "**/*.grin2"]
 build = "src/build/build.rs"
-edition = "2018"
+edition = "2021"
 
 [workspace]
 members = ["api", "chain", "config", "core", "keychain", "p2p", "servers", "store", "util", "pool"]
diff --git a/api/Cargo.toml b/api/Cargo.toml
index 88af1575..e87d0b4f 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 easy-jsonrpc-mw = "0.5.4"
diff --git a/chain/Cargo.toml b/chain/Cargo.toml
index c9fab243..3b930231 100644
--- a/chain/Cargo.toml
+++ b/chain/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bit-vec = "0.6"
diff --git a/config/Cargo.toml b/config/Cargo.toml
index 5700ea18..c7ea4743 100644
--- a/config/Cargo.toml
+++ b/config/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 rand = "0.6"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index e9229e2f..40798834 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 blake2 = { package = "blake2-rfc", version = "0.2"}
diff --git a/core/fuzz/Cargo.toml b/core/fuzz/Cargo.toml
index 158391ad..1cf4ffdb 100644
--- a/core/fuzz/Cargo.toml
+++ b/core/fuzz/Cargo.toml
@@ -3,7 +3,7 @@ name = "grin_core-fuzz"
 version = "0.0.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libfuzzer-sys = "0.4.0"
diff --git a/etc/gen_gen/_Cargo.toml b/etc/gen_gen/_Cargo.toml
index f053cda1..ba53139b 100644
--- a/etc/gen_gen/_Cargo.toml
+++ b/etc/gen_gen/_Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "grin_gen_gen"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Utility to automate the generation of Grin's genesis block"
 license = "Apache-2.0"
diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml
index 2d46b63d..1a7d1950 100644
--- a/keychain/Cargo.toml
+++ b/keychain/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = '..'
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 byteorder = "1"
diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml
index 274a07d4..ba42fc73 100644
--- a/p2p/Cargo.toml
+++ b/p2p/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bitflags = "1"
diff --git a/pool/Cargo.toml b/pool/Cargo.toml
index 3b0f77ad..8ff37d24 100644
--- a/pool/Cargo.toml
+++ b/pool/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = '..'
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 blake2-rfc = "0.2"
diff --git a/pool/fuzz/Cargo.toml b/pool/fuzz/Cargo.toml
index a10d61a7..c0aacd1f 100644
--- a/pool/fuzz/Cargo.toml
+++ b/pool/fuzz/Cargo.toml
@@ -3,7 +3,7 @@ name = "grin_pool_fuzz"
 version = "0.0.0"
 authors = ["Automatically generated"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 chrono = "0.4.11"
diff --git a/rustfmt.toml b/rustfmt.toml
index b2b24311..c691d12a 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,2 +1,2 @@
 hard_tabs = true
-edition = "2018"
+edition = "2021"
diff --git a/servers/Cargo.toml b/servers/Cargo.toml
index cb162771..16d8f775 100644
--- a/servers/Cargo.toml
+++ b/servers/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 hyper = { version = "0.14", features = ["full"] }
diff --git a/store/Cargo.toml b/store/Cargo.toml
index 72f30ca8..9974a4c3 100644
--- a/store/Cargo.toml
+++ b/store/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 byteorder = "1"
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 978b5568..a20a9759 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin"
 keywords = [ "crypto", "grin", "mimblewimble" ]
 workspace = ".."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0"