From 5e43177de73d7211ed9d084213c7bb91736158e4 Mon Sep 17 00:00:00 2001
From: Tomasz Kurcz <uint@lavabit.com>
Date: Wed, 19 Oct 2022 21:10:47 +0200
Subject: [PATCH 1/2] CI: bump Rust version

---
 .circleci/config.yml | 114 +++++++++++++++++++++----------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa1cc07b6..a0c2ec041 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,21 +28,21 @@ workflows:
     jobs:
       - build_and_upload_contracts:
           filters:
-           tags:
-             only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
-           branches:
-             ignore: /.*/
+            tags:
+              only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
+            branches:
+              ignore: /.*/
       - build_and_upload_schemas:
           filters:
-           tags:
-             only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
-           branches:
-             ignore: /.*/
+            tags:
+              only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
+            branches:
+              ignore: /.*/
 
 jobs:
   contract_cw1_subkeys:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw1-subkeys
     steps:
       - checkout:
@@ -52,7 +52,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw1-subkeys-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw1-subkeys-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -65,11 +65,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw1-subkeys-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw1-subkeys-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw1_whitelist:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw1-whitelist
     steps:
       - checkout:
@@ -79,7 +79,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw1-whitelist-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw1-whitelist-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -92,11 +92,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw1-whitelist-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw1-whitelist-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw3_fixed_multisig:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw3-fixed-multisig
     steps:
       - checkout:
@@ -106,7 +106,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw3-fixed-multisig-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw3-fixed-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -119,11 +119,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw3-fixed-multisig-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw3-fixed-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw3_flex_multisig:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw3-flex-multisig
     steps:
       - checkout:
@@ -133,7 +133,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw3-flex-multisig-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw3-flex-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -146,11 +146,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw3-flex-multisig-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw3-flex-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw4_group:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw4-group
     steps:
       - checkout:
@@ -160,7 +160,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw4-group-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw4-group-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -173,11 +173,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw4-group-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw4-group-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw4_stake:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw4-stake
     steps:
       - checkout:
@@ -187,7 +187,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw4-stake-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw4-stake-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -200,11 +200,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw4-stake-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw4-stake-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw20_base:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw20-base
     steps:
       - checkout:
@@ -214,7 +214,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw20-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw20-base-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -227,11 +227,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw20-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw20-base-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw20_ics20:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/contracts/cw20-ics20
     steps:
       - checkout:
@@ -241,7 +241,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw20-ics20-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw20-ics20-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -254,11 +254,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw20-ics20-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw20-ics20-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_controllers:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/packages/controllers
     steps:
       - checkout:
@@ -268,7 +268,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-controllers:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-controllers:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -279,11 +279,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-controllers:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-controllers:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw1:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/packages/cw1
     steps:
       - checkout:
@@ -293,7 +293,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw1:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw1:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -307,11 +307,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw1:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw1:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw2:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/packages/cw2
     steps:
       - checkout:
@@ -321,7 +321,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw2:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw2:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -333,11 +333,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw2:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw2:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw3:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/packages/cw3
     steps:
       - checkout:
@@ -347,7 +347,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw3:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw3:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -361,11 +361,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw3:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw3:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw4:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/packages/cw4
     steps:
       - checkout:
@@ -375,7 +375,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw4:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw4:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -389,11 +389,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw4:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw4:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw20:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/packages/cw20
     steps:
       - checkout:
@@ -403,7 +403,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw20:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw20:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -417,11 +417,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw20:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw20:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw1155:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project/packages/cw1155
     steps:
       - checkout:
@@ -431,7 +431,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw1155:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw1155:1.64.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -445,11 +445,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw1155:1.58.1-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw1155:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
   lint:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     steps:
       - checkout
       - run:
@@ -457,7 +457,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-lint-rust:1.58.1-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-lint-rust:1.64.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Add rustfmt component
           command: rustup component add rustfmt
@@ -476,7 +476,7 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-lint-rust:1.58.1-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-lint-rust:1.64.0-{{ checksum "Cargo.lock" }}
 
   # This runs one time on the top level to ensure all contracts compile properly into wasm.
   # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time
@@ -581,7 +581,7 @@ jobs:
 
   build_and_upload_schemas:
     docker:
-      - image: rust:1.58.1
+      - image: rust:1.64.0
     working_directory: ~/project
     steps:
       - checkout:

From 6c0174b9530fde6e625a62ec7b9b15e82d17a130 Mon Sep 17 00:00:00 2001
From: Tomasz Kurcz <uint@lavabit.com>
Date: Wed, 19 Oct 2022 21:55:20 +0200
Subject: [PATCH 2/2] Update Rust edition across the board

---
 contracts/cw1-subkeys/Cargo.toml        | 2 +-
 contracts/cw1-whitelist/Cargo.toml      | 2 +-
 contracts/cw20-base/Cargo.toml          | 2 +-
 contracts/cw20-ics20/Cargo.toml         | 2 +-
 contracts/cw3-fixed-multisig/Cargo.toml | 2 +-
 contracts/cw3-flex-multisig/Cargo.toml  | 2 +-
 contracts/cw4-group/Cargo.toml          | 2 +-
 contracts/cw4-stake/Cargo.toml          | 2 +-
 packages/controllers/Cargo.toml         | 2 +-
 packages/cw1/Cargo.toml                 | 2 +-
 packages/cw2/Cargo.toml                 | 2 +-
 packages/cw20/Cargo.toml                | 2 +-
 packages/cw3/Cargo.toml                 | 2 +-
 packages/cw4/Cargo.toml                 | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/contracts/cw1-subkeys/Cargo.toml b/contracts/cw1-subkeys/Cargo.toml
index a2ea8749f..658eeb57d 100644
--- a/contracts/cw1-subkeys/Cargo.toml
+++ b/contracts/cw1-subkeys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw1-subkeys"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Implement subkeys for authorizing native tokens as a cw1 proxy contract"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/contracts/cw1-whitelist/Cargo.toml b/contracts/cw1-whitelist/Cargo.toml
index 34dd9d53f..47fb37e6f 100644
--- a/contracts/cw1-whitelist/Cargo.toml
+++ b/contracts/cw1-whitelist/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw1-whitelist"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Implementation of an proxy contract using a whitelist"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/contracts/cw20-base/Cargo.toml b/contracts/cw20-base/Cargo.toml
index bc1683b4c..10235b426 100644
--- a/contracts/cw20-base/Cargo.toml
+++ b/contracts/cw20-base/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw20-base"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Basic implementation of a CosmWasm-20 compliant token"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/contracts/cw20-ics20/Cargo.toml b/contracts/cw20-ics20/Cargo.toml
index 9b58330b5..b74d4fd34 100644
--- a/contracts/cw20-ics20/Cargo.toml
+++ b/contracts/cw20-ics20/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw20-ics20"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "IBC Enabled contracts that receives CW20 tokens and sends them over ICS20 to a remote chain"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/contracts/cw3-fixed-multisig/Cargo.toml b/contracts/cw3-fixed-multisig/Cargo.toml
index f9ab43376..2e9208861 100644
--- a/contracts/cw3-fixed-multisig/Cargo.toml
+++ b/contracts/cw3-fixed-multisig/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw3-fixed-multisig"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Implementing cw3 with an fixed group multisig"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/contracts/cw3-flex-multisig/Cargo.toml b/contracts/cw3-flex-multisig/Cargo.toml
index 291f5e51c..076bd6638 100644
--- a/contracts/cw3-flex-multisig/Cargo.toml
+++ b/contracts/cw3-flex-multisig/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw3-flex-multisig"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Implementing cw3 with multiple voting patterns and dynamic groups"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/contracts/cw4-group/Cargo.toml b/contracts/cw4-group/Cargo.toml
index dba3b7f54..3f431f4b1 100644
--- a/contracts/cw4-group/Cargo.toml
+++ b/contracts/cw4-group/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw4-group"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Simple cw4 implementation of group membership controlled by admin "
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/contracts/cw4-stake/Cargo.toml b/contracts/cw4-stake/Cargo.toml
index af8e1f734..0bcdc0c72 100644
--- a/contracts/cw4-stake/Cargo.toml
+++ b/contracts/cw4-stake/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw4-stake"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "CW4 implementation of group based on staked tokens"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/packages/controllers/Cargo.toml b/packages/controllers/Cargo.toml
index e7083ed75..340a9ac4a 100644
--- a/packages/controllers/Cargo.toml
+++ b/packages/controllers/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw-controllers"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Common controllers we can reuse in many contracts"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/packages/cw1/Cargo.toml b/packages/cw1/Cargo.toml
index 35209202c..8ea1f149a 100644
--- a/packages/cw1/Cargo.toml
+++ b/packages/cw1/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw1"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Definition and types for the CosmWasm-1 interface"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/packages/cw2/Cargo.toml b/packages/cw2/Cargo.toml
index feab0a89b..e7f02ed12 100644
--- a/packages/cw2/Cargo.toml
+++ b/packages/cw2/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw2"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Definition and types for the CosmWasm-2 interface"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/packages/cw20/Cargo.toml b/packages/cw20/Cargo.toml
index fe912af57..a71df10b1 100644
--- a/packages/cw20/Cargo.toml
+++ b/packages/cw20/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw20"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "Definition and types for the CosmWasm-20 interface"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/packages/cw3/Cargo.toml b/packages/cw3/Cargo.toml
index 4c21b571f..2835d3268 100644
--- a/packages/cw3/Cargo.toml
+++ b/packages/cw3/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw3"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "CosmWasm-3 Interface: On-Chain MultiSig/Voting contracts"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"
diff --git a/packages/cw4/Cargo.toml b/packages/cw4/Cargo.toml
index adb1ddaed..ac01aea3a 100644
--- a/packages/cw4/Cargo.toml
+++ b/packages/cw4/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cw4"
 version = "0.16.0"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 description = "CosmWasm-4 Interface: Groups Members"
 license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-plus"