From 42aa9c224ea706b57095456568e18e4698aa89e5 Mon Sep 17 00:00:00 2001
From: Aumetra Weisman <aumetra@cryptolab.net>
Date: Tue, 28 Jan 2025 12:27:04 +0100
Subject: [PATCH 1/4] Fix warnings on nightly

---
 Cargo.lock                     | 12 ++++++------
 packages/go-gen/src/schema.rs  |  4 ++--
 packages/std/Cargo.toml        |  2 +-
 packages/std/src/lib.rs        |  2 +-
 packages/vm/Cargo.toml         |  4 +++-
 packages/vm/src/environment.rs |  7 +++----
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 61ffbb6b5c..c8ff2bd8e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -689,7 +689,7 @@ dependencies = [
  "cosmwasm-vm-derive",
  "crc32fast",
  "criterion",
- "derivative",
+ "derive_more",
  "dhat",
  "glob",
  "hex",
@@ -947,18 +947,18 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "1.0.0-beta.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "1.0.0-beta.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/packages/go-gen/src/schema.rs b/packages/go-gen/src/schema.rs
index 71955dd63d..eae293e5e7 100644
--- a/packages/go-gen/src/schema.rs
+++ b/packages/go-gen/src/schema.rs
@@ -62,7 +62,7 @@ pub fn schema_object_type(
         replace_custom_type(&replace_acronyms(
             reference
                 .split('/')
-                .last()
+                .next_back()
                 .expect("split should always return at least one item"),
         ))
     } else if let Some(t) = &schema.instance_type {
@@ -273,7 +273,7 @@ pub fn is_null(schema: &SchemaObject) -> bool {
     schema
         .instance_type
         .as_ref()
-        .map_or(false, |s| s.contains(&InstanceType::Null))
+        .is_some_and(|s| s.contains(&InstanceType::Null))
 }
 
 pub fn documentation(schema: &SchemaObject) -> Option<String> {
diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml
index 7d15f3e17b..172a795a89 100644
--- a/packages/std/Cargo.toml
+++ b/packages/std/Cargo.toml
@@ -61,7 +61,7 @@ base64 = "0.22.0"
 bnum = "0.11.0"
 cosmwasm-core = { version = "2.2.0-rc.1", path = "../core" }
 cosmwasm-derive = { version = "2.2.0-rc.1", path = "../derive" }
-derive_more = { version = "1.0.0-beta.6", default-features = false, features = [
+derive_more = { version = "1.0.0", default-features = false, features = [
     "debug",
 ] }
 hex = "0.4"
diff --git a/packages/std/src/lib.rs b/packages/std/src/lib.rs
index df970fa6eb..b02cd1d565 100644
--- a/packages/std/src/lib.rs
+++ b/packages/std/src/lib.rs
@@ -125,7 +125,7 @@ mod _warning {
     #[must_use = "cosmwasm-std feature `abort` is deprecated and will be removed in the next major release. You can just remove the feature as this functionality is now the default"]
     struct CompileWarning;
 
-    #[allow(dead_code)]
+    #[allow(dead_code, path_statements)]
     fn trigger_warning() {
         CompileWarning;
     }
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index 012b1b089f..df256d901a 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -52,7 +52,9 @@ cosmwasm-std = { version = "2.2.0-rc.1", path = "../std", default-features = fal
 ] }
 cosmwasm-crypto = { version = "2.2.0-rc.1", path = "../crypto" }
 cosmwasm-vm-derive = { version = "2.2.0-rc.1", path = "../vm-derive" }
-derivative = "2"
+derive_more = { version = "1.0.0", default-features = false, features = [
+    "debug",
+] }
 hex = "0.4"
 rand_core = { version = "0.6", features = ["getrandom"] }
 schemars = { workspace = true }
diff --git a/packages/vm/src/environment.rs b/packages/vm/src/environment.rs
index 0da0d5c5c6..bbf7eda96f 100644
--- a/packages/vm/src/environment.rs
+++ b/packages/vm/src/environment.rs
@@ -6,7 +6,7 @@ use std::ptr::NonNull;
 use std::rc::Rc;
 use std::sync::{Arc, RwLock};
 
-use derivative::Derivative;
+use derive_more::Debug;
 use wasmer::{AsStoreMut, Instance as WasmerInstance, Memory, MemoryView, Value};
 use wasmer_middlewares::metering::{get_remaining_points, set_remaining_points, MeteringPoints};
 
@@ -146,15 +146,14 @@ impl GasState {
 ///
 /// The currently unused lifetime parameter 'a allows accessing referenced data in the debug implementation
 /// without cloning it.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(Debug)]
 #[non_exhaustive]
 pub struct DebugInfo<'a> {
     pub gas_remaining: u64,
     // This field is just to allow us to add the unused lifetime parameter. It can be removed
     // at any time.
     #[doc(hidden)]
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     pub(crate) __lifetime: PhantomData<&'a ()>,
 }
 

From babd313d54e6791c325e2d48e73a2ee93974740a Mon Sep 17 00:00:00 2001
From: Aumetra Weisman <aumetra@cryptolab.net>
Date: Tue, 28 Jan 2025 12:28:51 +0100
Subject: [PATCH 2/4] Manually edit lockfile version

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8ff2bd8e0..2f30d51724 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "Inflector"

From 5c168e109850d330519f2154bcdd48b65dc994f4 Mon Sep 17 00:00:00 2001
From: Aumetra Weisman <aumetra@cryptolab.net>
Date: Tue, 28 Jan 2025 12:36:07 +0100
Subject: [PATCH 3/4] Downgrade derive_more to beta

---
 Cargo.lock              | 8 ++++----
 packages/std/Cargo.toml | 2 +-
 packages/vm/Cargo.toml  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2f30d51724..e504d1e042 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -947,18 +947,18 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "1.0.0"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "1.0.0"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml
index 172a795a89..fc2d464347 100644
--- a/packages/std/Cargo.toml
+++ b/packages/std/Cargo.toml
@@ -61,7 +61,7 @@ base64 = "0.22.0"
 bnum = "0.11.0"
 cosmwasm-core = { version = "2.2.0-rc.1", path = "../core" }
 cosmwasm-derive = { version = "2.2.0-rc.1", path = "../derive" }
-derive_more = { version = "1.0.0", default-features = false, features = [
+derive_more = { version = "=1.0.0-beta.7", default-features = false, features = [
     "debug",
 ] }
 hex = "0.4"
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index df256d901a..fc6b2639a8 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -52,7 +52,7 @@ cosmwasm-std = { version = "2.2.0-rc.1", path = "../std", default-features = fal
 ] }
 cosmwasm-crypto = { version = "2.2.0-rc.1", path = "../crypto" }
 cosmwasm-vm-derive = { version = "2.2.0-rc.1", path = "../vm-derive" }
-derive_more = { version = "1.0.0", default-features = false, features = [
+derive_more = { version = "=1.0.0-beta.7", default-features = false, features = [
     "debug",
 ] }
 hex = "0.4"

From 35d8c3a1caf0dff5608bd0d295ec4a8701059973 Mon Sep 17 00:00:00 2001
From: Aumetra Weisman <aumetra@cryptolab.net>
Date: Tue, 28 Jan 2025 12:39:13 +0100
Subject: [PATCH 4/4] Update lockfiles

---
 Cargo.lock                            |  8 +++---
 contracts/burner/Cargo.lock           |  2 +-
 contracts/crypto-verify/Cargo.lock    |  2 +-
 contracts/cyberpunk/Cargo.lock        |  2 +-
 contracts/empty/Cargo.lock            |  2 +-
 contracts/floaty/Cargo.lock           |  2 +-
 contracts/hackatom/Cargo.lock         |  2 +-
 contracts/ibc-callbacks/Cargo.lock    |  2 +-
 contracts/ibc-reflect-send/Cargo.lock |  2 +-
 contracts/ibc-reflect/Cargo.lock      |  2 +-
 contracts/nested-contracts/Cargo.lock | 40 +++++++++++++++++++++------
 contracts/queue/Cargo.lock            |  2 +-
 contracts/reflect/Cargo.lock          |  2 +-
 contracts/staking/Cargo.lock          |  2 +-
 contracts/virus/Cargo.lock            |  2 +-
 packages/std/Cargo.toml               |  2 +-
 packages/vm/Cargo.toml                |  2 +-
 17 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e504d1e042..f2212c5721 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -947,18 +947,18 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "1.0.0-beta.7"
+version = "1.0.0-beta.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe"
+checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "1.0.0-beta.7"
+version = "1.0.0-beta.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d"
+checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
index dea8631582..db478334f4 100644
--- a/contracts/burner/Cargo.lock
+++ b/contracts/burner/Cargo.lock
@@ -432,7 +432,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
index 64c00bba2c..f078f22ab0 100644
--- a/contracts/crypto-verify/Cargo.lock
+++ b/contracts/crypto-verify/Cargo.lock
@@ -427,7 +427,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
index 9e4f309318..fcbc0a8a05 100644
--- a/contracts/cyberpunk/Cargo.lock
+++ b/contracts/cyberpunk/Cargo.lock
@@ -456,7 +456,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/empty/Cargo.lock b/contracts/empty/Cargo.lock
index 3e446fabbf..0f67f168c1 100644
--- a/contracts/empty/Cargo.lock
+++ b/contracts/empty/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
index 3d6f40994b..d1a02607cf 100644
--- a/contracts/floaty/Cargo.lock
+++ b/contracts/floaty/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
index 1f63fa5c77..e48e26da8c 100644
--- a/contracts/hackatom/Cargo.lock
+++ b/contracts/hackatom/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/ibc-callbacks/Cargo.lock b/contracts/ibc-callbacks/Cargo.lock
index b0ac1ccbf8..eda407d8c4 100644
--- a/contracts/ibc-callbacks/Cargo.lock
+++ b/contracts/ibc-callbacks/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
index 76cce5ccd3..0db3107588 100644
--- a/contracts/ibc-reflect-send/Cargo.lock
+++ b/contracts/ibc-reflect-send/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
index 6fb821cb7b..55f153d70a 100644
--- a/contracts/ibc-reflect/Cargo.lock
+++ b/contracts/ibc-reflect/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/nested-contracts/Cargo.lock b/contracts/nested-contracts/Cargo.lock
index 13805da9e7..a109dc6831 100644
--- a/contracts/nested-contracts/Cargo.lock
+++ b/contracts/nested-contracts/Cargo.lock
@@ -212,21 +212,22 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "cosmwasm-core"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6ceb8624260d0d3a67c4e1a1d43fc7e9406720afbcb124521501dd138f90aa"
+checksum = "c34c440d4d8e3ecec783d0f9c89d25565168b0f4cdb80a1f6a387cf2168c0740"
 
 [[package]]
 name = "cosmwasm-crypto"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4125381e5fd7fefe9f614640049648088015eca2b60d861465329a5d87dfa538"
+checksum = "134e765161d60228cc27635032d2a466542ca83fd6c87f3c87f4963c0bd51008"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
  "ark-ff",
  "ark-serialize",
  "cosmwasm-core",
+ "curve25519-dalek",
  "digest",
  "ecdsa",
  "ed25519-zebra",
@@ -241,9 +242,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-derive"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5658b1dc64e10b56ae7a449f678f96932a96f6cfad1769d608d1d1d656480a"
+checksum = "3c94a4b93e722c91d2e58471cfe69480f4a656cfccacd8bfda5638f2a5d4512b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -276,9 +277,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-std"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70eb7ab0c1e99dd6207496963ba2a457c4128ac9ad9c72a83f8d9808542b849b"
+checksum = "4434e556b0aebff34bf082e75d175b5d7edbcf1d90d4cedb59623a1249fff567"
 dependencies = [
  "base64",
  "bech32",
@@ -289,6 +290,7 @@ dependencies = [
  "derive_more",
  "hex",
  "rand_core",
+ "rmp-serde",
  "schemars",
  "serde",
  "serde-json-wasm",
@@ -889,6 +891,28 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
index e386207992..b1cee1d52a 100644
--- a/contracts/queue/Cargo.lock
+++ b/contracts/queue/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
index 939275d00c..0949ad8ad7 100644
--- a/contracts/reflect/Cargo.lock
+++ b/contracts/reflect/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
index 411282c26a..d32439d34a 100644
--- a/contracts/staking/Cargo.lock
+++ b/contracts/staking/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock
index 35710351f9..fb91b0e6bf 100644
--- a/contracts/virus/Cargo.lock
+++ b/contracts/virus/Cargo.lock
@@ -421,7 +421,7 @@ dependencies = [
  "cosmwasm-std",
  "cosmwasm-vm-derive",
  "crc32fast",
- "derivative",
+ "derive_more",
  "hex",
  "rand_core",
  "schemars",
diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml
index fc2d464347..d357b01d0e 100644
--- a/packages/std/Cargo.toml
+++ b/packages/std/Cargo.toml
@@ -61,7 +61,7 @@ base64 = "0.22.0"
 bnum = "0.11.0"
 cosmwasm-core = { version = "2.2.0-rc.1", path = "../core" }
 cosmwasm-derive = { version = "2.2.0-rc.1", path = "../derive" }
-derive_more = { version = "=1.0.0-beta.7", default-features = false, features = [
+derive_more = { version = "=1.0.0-beta.6", default-features = false, features = [
     "debug",
 ] }
 hex = "0.4"
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index fc6b2639a8..845834abf0 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -52,7 +52,7 @@ cosmwasm-std = { version = "2.2.0-rc.1", path = "../std", default-features = fal
 ] }
 cosmwasm-crypto = { version = "2.2.0-rc.1", path = "../crypto" }
 cosmwasm-vm-derive = { version = "2.2.0-rc.1", path = "../vm-derive" }
-derive_more = { version = "=1.0.0-beta.7", default-features = false, features = [
+derive_more = { version = "=1.0.0-beta.6", default-features = false, features = [
     "debug",
 ] }
 hex = "0.4"