diff --git a/Cargo.lock b/Cargo.lock
index d49f414859ca..1675a170efb0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3539,11 +3539,11 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "8.0.1"
+version = "7.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "012bb02250fdd38faa5feee63235f7a459974440b9b57593822414c31f92839e"
+checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.12.3",
  "pem",
  "ring",
  "serde",
@@ -5101,11 +5101,13 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "1.0.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947"
+checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
 dependencies = [
  "base64 0.13.0",
+ "once_cell",
+ "regex",
 ]
 
 [[package]]
@@ -5567,15 +5569,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quickcheck"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-dependencies = [
- "rand 0.8.4",
-]
-
 [[package]]
 name = "quicksink"
 version = "0.1.2"
@@ -6436,14 +6429,13 @@ dependencies = [
 
 [[package]]
 name = "simple_asn1"
-version = "0.6.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a762b1c38b9b990c694b9c2f8abe3372ce6a9ceaae6bca39cfc46e054f45745"
+checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b"
 dependencies = [
- "num-bigint 0.4.3",
+ "chrono",
+ "num-bigint 0.2.6",
  "num-traits",
- "thiserror",
- "time 0.3.7",
 ]
 
 [[package]]
@@ -7154,7 +7146,7 @@ dependencies = [
  "libc",
  "standback",
  "stdweb",
- "time-macros 0.1.1",
+ "time-macros",
  "version_check",
  "winapi 0.3.9",
 ]
@@ -7168,9 +7160,7 @@ dependencies = [
  "itoa 1.0.1",
  "libc",
  "num_threads",
- "quickcheck",
  "serde",
- "time-macros 0.2.3",
 ]
 
 [[package]]
@@ -7183,12 +7173,6 @@ dependencies = [
  "time-macros-impl",
 ]
 
-[[package]]
-name = "time-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6"
-
 [[package]]
 name = "time-macros-impl"
 version = "0.1.2"
diff --git a/blockchain/beacon/Cargo.toml b/blockchain/beacon/Cargo.toml
index 86aa56a8a001..4f7af31eb98c 100644
--- a/blockchain/beacon/Cargo.toml
+++ b/blockchain/beacon/Cargo.toml
@@ -2,7 +2,7 @@
 name = "beacon"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.docs.rs]
 features = ["json"]
diff --git a/blockchain/blocks/Cargo.toml b/blockchain/blocks/Cargo.toml
index 9c01efaa4e94..60ee80f04663 100644
--- a/blockchain/blocks/Cargo.toml
+++ b/blockchain/blocks/Cargo.toml
@@ -2,7 +2,7 @@
 name = "forest_blocks"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.docs.rs]
 features = ["json"]
diff --git a/blockchain/chain/Cargo.toml b/blockchain/chain/Cargo.toml
index d5fd4ddd9a37..48cdb87253cb 100644
--- a/blockchain/chain/Cargo.toml
+++ b/blockchain/chain/Cargo.toml
@@ -2,7 +2,7 @@
 name = "chain"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 blocks = { package = "forest_blocks", path = "../blocks", features = ["json"] }
diff --git a/blockchain/chain_sync/Cargo.toml b/blockchain/chain_sync/Cargo.toml
index 97233cc0adb3..4b8d3e18a017 100644
--- a/blockchain/chain_sync/Cargo.toml
+++ b/blockchain/chain_sync/Cargo.toml
@@ -2,7 +2,7 @@
 name = "chain_sync"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 address = { package = "forest_address", version = "0.3" }
diff --git a/blockchain/message_pool/Cargo.toml b/blockchain/message_pool/Cargo.toml
index 396f1e4de757..9b12c78b2662 100644
--- a/blockchain/message_pool/Cargo.toml
+++ b/blockchain/message_pool/Cargo.toml
@@ -2,7 +2,7 @@
 name = "message_pool"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 address = { package = "forest_address", version = "0.3" }
diff --git a/blockchain/state_manager/Cargo.toml b/blockchain/state_manager/Cargo.toml
index 44ec739629dd..284eda75dc29 100644
--- a/blockchain/state_manager/Cargo.toml
+++ b/blockchain/state_manager/Cargo.toml
@@ -2,7 +2,7 @@
 name = "state_manager"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.docs.rs]
 features = ["statediff"]
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
index 4f451b6466af..40ed943cfabc 100644
--- a/crypto/Cargo.toml
+++ b/crypto/Cargo.toml
@@ -4,7 +4,7 @@ description = "Filecoin crypto utilities for use in Forest"
 license = "MIT OR Apache-2.0"
 version = "0.5.2"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [package.metadata.docs.rs]
diff --git a/encoding/Cargo.toml b/encoding/Cargo.toml
index c38c36c3abd0..04d27db73ae4 100644
--- a/encoding/Cargo.toml
+++ b/encoding/Cargo.toml
@@ -4,7 +4,7 @@ description = "Filecoin encoding and decoding utilities for use in Forest"
 license = "MIT OR Apache-2.0"
 version = "0.2.2"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/forest/Cargo.toml b/forest/Cargo.toml
index 8b40ac8794a2..b4bc921e7dbe 100644
--- a/forest/Cargo.toml
+++ b/forest/Cargo.toml
@@ -3,7 +3,7 @@ name = "forest"
 version = "0.2.1"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
 description = "Filecoin implementation in Rust. This command will start the daemon process."
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 
 [dependencies]
diff --git a/ipld/Cargo.toml b/ipld/Cargo.toml
index 8f8ce69242f5..854abeddfed8 100644
--- a/ipld/Cargo.toml
+++ b/ipld/Cargo.toml
@@ -4,7 +4,7 @@ description = "Interplanetary linked data types and implementation"
 version = "0.1.1"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [package.metadata.docs.rs]
diff --git a/ipld/amt/Cargo.toml b/ipld/amt/Cargo.toml
index 226005096ea7..537aa0a90cdf 100644
--- a/ipld/amt/Cargo.toml
+++ b/ipld/amt/Cargo.toml
@@ -4,7 +4,7 @@ description = "Sharded IPLD Array implementation."
 version = "1.0.0"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/ipld/amt/fuzz/Cargo.toml b/ipld/amt/fuzz/Cargo.toml
index 7a3bcd929533..cb4aaf83e9d4 100644
--- a/ipld/amt/fuzz/Cargo.toml
+++ b/ipld/amt/fuzz/Cargo.toml
@@ -4,7 +4,7 @@ name = "ipld_amt-fuzz"
 version = "0.0.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true
diff --git a/ipld/blockstore/Cargo.toml b/ipld/blockstore/Cargo.toml
index 997b65fb3054..1825ae5cea7e 100644
--- a/ipld/blockstore/Cargo.toml
+++ b/ipld/blockstore/Cargo.toml
@@ -4,7 +4,7 @@ description = "IPLD storage interface"
 version = "0.1.1"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/ipld/car/Cargo.toml b/ipld/car/Cargo.toml
index 662d3b3e5325..b06f42652751 100644
--- a/ipld/car/Cargo.toml
+++ b/ipld/car/Cargo.toml
@@ -2,7 +2,7 @@
 name = "forest_car"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cid = { package = "forest_cid", version = "0.3", features = ["cbor"] }
diff --git a/ipld/cid/Cargo.toml b/ipld/cid/Cargo.toml
index edc84dea8a22..6d0c795b2ac4 100644
--- a/ipld/cid/Cargo.toml
+++ b/ipld/cid/Cargo.toml
@@ -4,7 +4,7 @@ description = "A Cid library used in Forest for the Filecoin protocol"
 license = "MIT OR Apache-2.0"
 version = "0.3.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [package.metadata.docs.rs]
diff --git a/ipld/graphsync/Cargo.toml b/ipld/graphsync/Cargo.toml
index 32b875da2dc2..4a96a3aaca2e 100644
--- a/ipld/graphsync/Cargo.toml
+++ b/ipld/graphsync/Cargo.toml
@@ -2,7 +2,7 @@
 name = "graphsync"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 protobuf = "2.14.0"
diff --git a/ipld/hamt/Cargo.toml b/ipld/hamt/Cargo.toml
index 44340f555d49..84551a91963f 100644
--- a/ipld/hamt/Cargo.toml
+++ b/ipld/hamt/Cargo.toml
@@ -4,7 +4,7 @@ description = "Sharded IPLD HashMap implementation."
 version = "2.0.0"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/ipld/hamt/fuzz/Cargo.toml b/ipld/hamt/fuzz/Cargo.toml
index 9167f024823b..26a57a56f469 100644
--- a/ipld/hamt/fuzz/Cargo.toml
+++ b/ipld/hamt/fuzz/Cargo.toml
@@ -4,7 +4,7 @@ name = "ipld_hamt-fuzz"
 version = "0.0.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true
diff --git a/key_management/Cargo.toml b/key_management/Cargo.toml
index 0e07366fe375..160f68d93860 100644
--- a/key_management/Cargo.toml
+++ b/key_management/Cargo.toml
@@ -2,7 +2,7 @@
 name = "key_management"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.docs.rs]
 features = ["json"]
diff --git a/node/clock/Cargo.toml b/node/clock/Cargo.toml
index 56960338c20e..eec9f2c37582 100644
--- a/node/clock/Cargo.toml
+++ b/node/clock/Cargo.toml
@@ -4,7 +4,7 @@ description = "Filecoin clock types and ChainEpoch functionality"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/node/db/Cargo.toml b/node/db/Cargo.toml
index 913e97a441cc..fc5f423f0265 100644
--- a/node/db/Cargo.toml
+++ b/node/db/Cargo.toml
@@ -4,7 +4,7 @@ description = "Database types used in Forest"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/node/forest_libp2p/Cargo.toml b/node/forest_libp2p/Cargo.toml
index 6bbba5da13e0..6d4a930d0b47 100644
--- a/node/forest_libp2p/Cargo.toml
+++ b/node/forest_libp2p/Cargo.toml
@@ -2,7 +2,7 @@
 name = "forest_libp2p"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 utils = { path = "../utils" }
diff --git a/node/rpc-api/Cargo.toml b/node/rpc-api/Cargo.toml
index eccafe69517f..4e0f8fa5befc 100644
--- a/node/rpc-api/Cargo.toml
+++ b/node/rpc-api/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rpc-api"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 # Internal
diff --git a/node/rpc-client/Cargo.toml b/node/rpc-client/Cargo.toml
index 2be81732b8a3..2c790770b221 100644
--- a/node/rpc-client/Cargo.toml
+++ b/node/rpc-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 name = "rpc-client"
 version = "0.1.0"
 
diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml
index dbae262b020f..3cee88e2d60f 100644
--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rpc"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 # Public
diff --git a/node/utils/Cargo.toml b/node/utils/Cargo.toml
index 4b1fa73353fc..3414e5130df3 100644
--- a/node/utils/Cargo.toml
+++ b/node/utils/Cargo.toml
@@ -2,7 +2,7 @@
 name = "utils"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 dirs = "3.0"
diff --git a/rustfmt.toml b/rustfmt.toml
index 32a9786fa1c4..3a26366d4da6 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1 +1 @@
-edition = "2018"
+edition = "2021"
diff --git a/tests/conformance_tests/Cargo.toml b/tests/conformance_tests/Cargo.toml
index fa10e610690e..73a155db05c3 100644
--- a/tests/conformance_tests/Cargo.toml
+++ b/tests/conformance_tests/Cargo.toml
@@ -2,7 +2,7 @@
 name = "conformance_tests"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 default = []
diff --git a/tests/serialization_tests/Cargo.toml b/tests/serialization_tests/Cargo.toml
index 65a302884ae1..040e875c338d 100644
--- a/tests/serialization_tests/Cargo.toml
+++ b/tests/serialization_tests/Cargo.toml
@@ -2,7 +2,7 @@
 name = "serialization_tests"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 submodule_tests = []
diff --git a/types/Cargo.toml b/types/Cargo.toml
index b8074c82fb09..81b28b6cd1c7 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -4,7 +4,7 @@ description = "Filecoin types used in Forest."
 version = "0.2.2"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [package.metadata.docs.rs]
diff --git a/types/networks/Cargo.toml b/types/networks/Cargo.toml
index 65411a528086..9f2a5ad3de80 100644
--- a/types/networks/Cargo.toml
+++ b/types/networks/Cargo.toml
@@ -2,7 +2,7 @@
 name = "networks"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 fil_types = { path = "../../types" }
diff --git a/utils/auth/Cargo.toml b/utils/auth/Cargo.toml
index 40a737333c52..d9615a39a449 100644
--- a/utils/auth/Cargo.toml
+++ b/utils/auth/Cargo.toml
@@ -2,7 +2,7 @@
 name = "auth"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 # Public
diff --git a/utils/bigint/Cargo.toml b/utils/bigint/Cargo.toml
index a5e80782cb23..27f1005480bc 100644
--- a/utils/bigint/Cargo.toml
+++ b/utils/bigint/Cargo.toml
@@ -4,7 +4,7 @@ description = "BigInt utilities for use in Forest"
 license = "MIT OR Apache-2.0"
 version = "0.1.4"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [package.metadata.docs.rs]
diff --git a/utils/bitfield/Cargo.toml b/utils/bitfield/Cargo.toml
index fccefed9f515..a56e1415652f 100644
--- a/utils/bitfield/Cargo.toml
+++ b/utils/bitfield/Cargo.toml
@@ -4,7 +4,7 @@ description = "Bitfield logic for use in Filecoin actors"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/utils/commcid/Cargo.toml b/utils/commcid/Cargo.toml
index 40321a3b2f2c..8688cce18b43 100644
--- a/utils/commcid/Cargo.toml
+++ b/utils/commcid/Cargo.toml
@@ -4,7 +4,7 @@ description = "Filecoin commitment to Cid conversion utilities"
 version = "0.1.1"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/utils/genesis/Cargo.toml b/utils/genesis/Cargo.toml
index 7ab1f181e1f4..e3ce6ed6247c 100644
--- a/utils/genesis/Cargo.toml
+++ b/utils/genesis/Cargo.toml
@@ -2,7 +2,7 @@
 name = "genesis"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 testing = []
diff --git a/utils/hash_utils/Cargo.toml b/utils/hash_utils/Cargo.toml
index e8a704d020ea..0ab38cfbec33 100644
--- a/utils/hash_utils/Cargo.toml
+++ b/utils/hash_utils/Cargo.toml
@@ -4,7 +4,7 @@ description = "Shared hashing utilities used in Ipld Hamt and shared references
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/utils/json_utils/Cargo.toml b/utils/json_utils/Cargo.toml
index c3f507a260f4..a4ac49160072 100644
--- a/utils/json_utils/Cargo.toml
+++ b/utils/json_utils/Cargo.toml
@@ -4,7 +4,7 @@ description = "JSON utilities used to interoperate with default golang JSON defa
 license = "MIT OR Apache-2.0"
 version = "0.1.1"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/utils/metrics/Cargo.toml b/utils/metrics/Cargo.toml
index 404f9b8831b1..58c788f69f23 100644
--- a/utils/metrics/Cargo.toml
+++ b/utils/metrics/Cargo.toml
@@ -2,7 +2,7 @@
 name = "metrics"
 version = "0.1.0"
 authors = ["jorge <jorgeaolivero@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 prometheus =  { version = "0.12.0", features = ["process"] }
diff --git a/utils/net_utils/Cargo.toml b/utils/net_utils/Cargo.toml
index 89f1886c97fe..52738aa2b389 100644
--- a/utils/net_utils/Cargo.toml
+++ b/utils/net_utils/Cargo.toml
@@ -2,7 +2,7 @@
 name = "net_utils"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 isahc = "0.9.11"
diff --git a/utils/paramfetch/Cargo.toml b/utils/paramfetch/Cargo.toml
index 04698840435f..c3708eb9be89 100644
--- a/utils/paramfetch/Cargo.toml
+++ b/utils/paramfetch/Cargo.toml
@@ -2,7 +2,7 @@
 name = "paramfetch"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 surf = "2.0"
diff --git a/utils/statediff/Cargo.toml b/utils/statediff/Cargo.toml
index 160bede3b783..0e2bc8c0306b 100644
--- a/utils/statediff/Cargo.toml
+++ b/utils/statediff/Cargo.toml
@@ -2,7 +2,7 @@
 name = "statediff"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde_json = "1.0"
diff --git a/utils/test_utils/Cargo.toml b/utils/test_utils/Cargo.toml
index 881b2825bacf..6e27e0645baf 100644
--- a/utils/test_utils/Cargo.toml
+++ b/utils/test_utils/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_utils"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.docs.rs]
 features = ["test_constructors"]
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 2c90431ce234..588d3bc4d00f 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -4,7 +4,7 @@ description = "Forest VM types"
 license = "MIT OR Apache-2.0"
 version = "0.3.1"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [package.metadata.docs.rs]
diff --git a/vm/actor/Cargo.toml b/vm/actor/Cargo.toml
index 47ada59ed0c6..b242f0246fea 100644
--- a/vm/actor/Cargo.toml
+++ b/vm/actor/Cargo.toml
@@ -4,7 +4,7 @@ description = "Actors for the Filecoin protocol"
 version = "4.0.0"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/vm/actor_interface/Cargo.toml b/vm/actor_interface/Cargo.toml
index fa9106cb46b2..57871ffd41bb 100644
--- a/vm/actor_interface/Cargo.toml
+++ b/vm/actor_interface/Cargo.toml
@@ -2,7 +2,7 @@
 name = "actor_interface"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 actorv0 = { package = "forest_actor", version = "0.1" }
diff --git a/vm/address/Cargo.toml b/vm/address/Cargo.toml
index 07ffd24b696e..a3f3e1a9a6a9 100644
--- a/vm/address/Cargo.toml
+++ b/vm/address/Cargo.toml
@@ -4,7 +4,7 @@ description = "Filecoin addresses for use in Forest"
 license = "MIT OR Apache-2.0"
 version = "0.3.1"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/vm/interpreter/Cargo.toml b/vm/interpreter/Cargo.toml
index 735b098946c2..0bcbf7391382 100644
--- a/vm/interpreter/Cargo.toml
+++ b/vm/interpreter/Cargo.toml
@@ -2,7 +2,7 @@
 name = "interpreter"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 address = { package = "forest_address", version = "0.3" }
diff --git a/vm/message/Cargo.toml b/vm/message/Cargo.toml
index d6ef7a87b24f..ce043425caa5 100644
--- a/vm/message/Cargo.toml
+++ b/vm/message/Cargo.toml
@@ -4,7 +4,7 @@ description = "Filecoin message types"
 license = "MIT OR Apache-2.0"
 version = "0.7.2"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [package.metadata.docs.rs]
diff --git a/vm/runtime/Cargo.toml b/vm/runtime/Cargo.toml
index 49b7b6659470..cab97a6fb3d5 100644
--- a/vm/runtime/Cargo.toml
+++ b/vm/runtime/Cargo.toml
@@ -4,7 +4,7 @@ description = "Runtime for use in Filecoin protocol"
 version = "0.2.1"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ChainSafe/forest"
 
 [dependencies]
diff --git a/vm/state_migration/Cargo.toml b/vm/state_migration/Cargo.toml
index a933a605d12d..c358e8fca864 100644
--- a/vm/state_migration/Cargo.toml
+++ b/vm/state_migration/Cargo.toml
@@ -2,7 +2,7 @@
 name = "state_migration"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 fil_types = { path="../../types" }
diff --git a/vm/state_tree/Cargo.toml b/vm/state_tree/Cargo.toml
index 76ec626feac7..b7916159d283 100644
--- a/vm/state_tree/Cargo.toml
+++ b/vm/state_tree/Cargo.toml
@@ -2,7 +2,7 @@
 name = "state_tree"
 version = "0.1.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 actor = { package = "actor_interface", path = "../actor_interface" }