diff --git a/crates/iota-sdk-crypto/Cargo.toml b/crates/iota-sdk-crypto/Cargo.toml
index cfd2e1cbe..88c1199cd 100644
--- a/crates/iota-sdk-crypto/Cargo.toml
+++ b/crates/iota-sdk-crypto/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iota-sdk-crypto"
 version = "0.0.1-alpha.1"
 authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/iotaledger/iota-rust-sdk/"
diff --git a/crates/iota-sdk-graphql-client-build/Cargo.toml b/crates/iota-sdk-graphql-client-build/Cargo.toml
index b5e868045..6a7b5c131 100644
--- a/crates/iota-sdk-graphql-client-build/Cargo.toml
+++ b/crates/iota-sdk-graphql-client-build/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iota-sdk-graphql-client-build"
 version = "0.0.1-alpha.1"
 authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/iotaledger/iota-rust-sdk/"
diff --git a/crates/iota-sdk-graphql-client/Cargo.toml b/crates/iota-sdk-graphql-client/Cargo.toml
index 2a6dbaaba..b79b2520d 100644
--- a/crates/iota-sdk-graphql-client/Cargo.toml
+++ b/crates/iota-sdk-graphql-client/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iota-sdk-graphql-client"
 version = "0.0.1-alpha.1"
 authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/iotaledger/iota-rust-sdk/"
diff --git a/crates/iota-sdk-graphql-client/src/lib.rs b/crates/iota-sdk-graphql-client/src/lib.rs
index dd00c75f5..4f93e8b74 100644
--- a/crates/iota-sdk-graphql-client/src/lib.rs
+++ b/crates/iota-sdk-graphql-client/src/lib.rs
@@ -1312,15 +1312,14 @@ impl Client {
             digest: digest.to_string(),
         });
         let response = self.run_query(&operation).await?;
-        if let Some(block) = response.transaction_block {
-            if block
+        if let Some(block) = response.transaction_block
+            && block
                 .effects
                 .as_ref()
                 .and_then(|e| e.checkpoint.as_ref())
                 .is_some()
-            {
-                return Ok(true);
-            }
+        {
+            return Ok(true);
         }
         Ok(false)
     }
diff --git a/crates/iota-sdk-graphql-client/src/query_types/normalized_move/mod.rs b/crates/iota-sdk-graphql-client/src/query_types/normalized_move/mod.rs
index 89442f88b..b6c401b6e 100644
--- a/crates/iota-sdk-graphql-client/src/query_types/normalized_move/mod.rs
+++ b/crates/iota-sdk-graphql-client/src/query_types/normalized_move/mod.rs
@@ -54,29 +54,29 @@ impl std::fmt::Display for MoveFunction {
             write!(f, "entry ")?;
         }
         write!(f, "{}", self.name)?;
-        if let Some(type_params) = &self.type_parameters {
-            if !type_params.is_empty() {
-                write!(f, "<")?;
-                for (i, param) in type_params.iter().enumerate() {
-                    if i > 0 {
-                        write!(f, ", ")?;
-                    }
-                    write!(f, "T{i}")?;
-                    if !param.constraints.is_empty() {
-                        write!(
-                            f,
-                            ": {}",
-                            param
-                                .constraints
-                                .iter()
-                                .map(|v| v.to_string())
-                                .collect::<Vec<_>>()
-                                .join(" + ")
-                        )?;
-                    }
+        if let Some(type_params) = &self.type_parameters
+            && !type_params.is_empty()
+        {
+            write!(f, "<")?;
+            for (i, param) in type_params.iter().enumerate() {
+                if i > 0 {
+                    write!(f, ", ")?;
+                }
+                write!(f, "T{i}")?;
+                if !param.constraints.is_empty() {
+                    write!(
+                        f,
+                        ": {}",
+                        param
+                            .constraints
+                            .iter()
+                            .map(|v| v.to_string())
+                            .collect::<Vec<_>>()
+                            .join(" + ")
+                    )?;
                 }
-                write!(f, ">")?;
             }
+            write!(f, ">")?;
         }
         write!(f, "(")?;
         if let Some(params) = &self.parameters {
@@ -91,21 +91,21 @@ impl std::fmt::Display for MoveFunction {
             )?;
         }
         write!(f, ")")?;
-        if let Some(return_) = &self.return_ {
-            if !return_.is_empty() {
-                if return_.len() > 1 {
-                    write!(
-                        f,
-                        " -> ({})",
-                        return_
-                            .iter()
-                            .map(|v| v.repr.replace("$", "T"))
-                            .collect::<Vec<_>>()
-                            .join(", ")
-                    )?;
-                } else {
-                    write!(f, " -> {}", return_.first().unwrap().repr.replace("$", "T"))?;
-                }
+        if let Some(return_) = &self.return_
+            && !return_.is_empty()
+        {
+            if return_.len() > 1 {
+                write!(
+                    f,
+                    " -> ({})",
+                    return_
+                        .iter()
+                        .map(|v| v.repr.replace("$", "T"))
+                        .collect::<Vec<_>>()
+                        .join(", ")
+                )?;
+            } else {
+                write!(f, " -> {}", return_.first().unwrap().repr.replace("$", "T"))?;
             }
         }
         Ok(())
diff --git a/crates/iota-sdk-transaction-builder/Cargo.toml b/crates/iota-sdk-transaction-builder/Cargo.toml
index e534d8921..9f960cb81 100644
--- a/crates/iota-sdk-transaction-builder/Cargo.toml
+++ b/crates/iota-sdk-transaction-builder/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iota-sdk-transaction-builder"
 version = "0.0.1-alpha.1"
 authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 repository = "https://github.com/iotaledger/iota-rust-sdk/"
 description = "Transaction API for the IOTA Blockchain Rust SDK"
diff --git a/crates/iota-sdk-transaction-builder/src/builder/gas_station.rs b/crates/iota-sdk-transaction-builder/src/builder/gas_station.rs
index ad48344e7..60bcb0ab1 100644
--- a/crates/iota-sdk-transaction-builder/src/builder/gas_station.rs
+++ b/crates/iota-sdk-transaction-builder/src/builder/gas_station.rs
@@ -386,7 +386,7 @@ impl GasStationData {
     ) -> Result<serde_json::Value, Error> {
         let client = reqwest::Client::new();
         let reservation_id = match txn {
-            Transaction::V1(ref mut inner_txn) => {
+            Transaction::V1(inner_txn) => {
                 let reservation = self
                     .reserve_gas(inner_txn.gas_payment.budget, &client)
                     .await?;
diff --git a/crates/iota-sdk-transaction-builder/src/builder/mod.rs b/crates/iota-sdk-transaction-builder/src/builder/mod.rs
index d262c562a..46589f7f8 100644
--- a/crates/iota-sdk-transaction-builder/src/builder/mod.rs
+++ b/crates/iota-sdk-transaction-builder/src/builder/mod.rs
@@ -964,10 +964,10 @@ impl<C: ClientMethods, L> TransactionBuilder<C, L> {
                     }
                     _ => &[],
                 } {
-                    if let Argument::Input(idx) = arg {
-                        if let Some(obj_id) = self.data.inputs[idx].object_id() {
-                            unusable_object_ids.insert(*obj_id);
-                        }
+                    if let Argument::Input(idx) = arg
+                        && let Some(obj_id) = self.data.inputs[idx].object_id()
+                    {
+                        unusable_object_ids.insert(*obj_id);
                     }
                 }
             }
diff --git a/crates/iota-sdk-types/Cargo.toml b/crates/iota-sdk-types/Cargo.toml
index b54fd5afb..d54dba6c8 100644
--- a/crates/iota-sdk-types/Cargo.toml
+++ b/crates/iota-sdk-types/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iota-sdk-types"
 version = "0.0.1-alpha.1"
 authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/iotaledger/iota-rust-sdk/"
diff --git a/crates/iota-sdk-types/src/address.rs b/crates/iota-sdk-types/src/address.rs
index 424e59aff..b374e960b 100644
--- a/crates/iota-sdk-types/src/address.rs
+++ b/crates/iota-sdk-types/src/address.rs
@@ -274,7 +274,7 @@ impl schemars::JsonSchema for Address {
         "Address".to_owned()
     }
 
-    fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+    fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
         use schemars::schema::{InstanceType, Metadata, SchemaObject, StringValidation};
 
         let hex_length = Address::LENGTH * 2;
diff --git a/crates/iota-sdk-types/src/crypto/multisig.rs b/crates/iota-sdk-types/src/crypto/multisig.rs
index 2fbcfa1b4..493e29342 100644
--- a/crates/iota-sdk-types/src/crypto/multisig.rs
+++ b/crates/iota-sdk-types/src/crypto/multisig.rs
@@ -481,8 +481,10 @@ mod serialization {
             ReadableMemberPublicKey::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableMemberPublicKey::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableMemberPublicKey::json_schema(generator)
         }
     }
 
@@ -587,8 +589,10 @@ mod serialization {
             ReadableMemberSignature::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableMemberSignature::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableMemberSignature::json_schema(generator)
         }
     }
 
diff --git a/crates/iota-sdk-types/src/crypto/passkey.rs b/crates/iota-sdk-types/src/crypto/passkey.rs
index d0d9a084e..a4d469d68 100644
--- a/crates/iota-sdk-types/src/crypto/passkey.rs
+++ b/crates/iota-sdk-types/src/crypto/passkey.rs
@@ -149,8 +149,10 @@ mod serialization {
             Authenticator::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            Authenticator::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            Authenticator::json_schema(generator)
         }
     }
 
diff --git a/crates/iota-sdk-types/src/crypto/signature.rs b/crates/iota-sdk-types/src/crypto/signature.rs
index a194a63f8..bfe290fcd 100644
--- a/crates/iota-sdk-types/src/crypto/signature.rs
+++ b/crates/iota-sdk-types/src/crypto/signature.rs
@@ -725,8 +725,10 @@ mod serialization {
             ReadableUserSignature::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableUserSignature::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableUserSignature::json_schema(generator)
         }
     }
 
diff --git a/crates/iota-sdk-types/src/execution_status.rs b/crates/iota-sdk-types/src/execution_status.rs
index 0f41a9ea8..8f7715bba 100644
--- a/crates/iota-sdk-types/src/execution_status.rs
+++ b/crates/iota-sdk-types/src/execution_status.rs
@@ -555,8 +555,10 @@ mod serialization {
             ReadableExecutionStatus::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableExecutionStatus::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableExecutionStatus::json_schema(generator)
         }
     }
 
diff --git a/crates/iota-sdk-types/src/lib.rs b/crates/iota-sdk-types/src/lib.rs
index 80f7f1750..5458df415 100644
--- a/crates/iota-sdk-types/src/lib.rs
+++ b/crates/iota-sdk-types/src/lib.rs
@@ -428,7 +428,7 @@ mod _schemars {
             "u64".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     description: Some("Radix-10 encoded 64-bit unsigned integer".to_owned()),
@@ -453,7 +453,7 @@ mod _schemars {
             "i128".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     description: Some("Radix-10 encoded 128-bit signed integer".to_owned()),
@@ -478,7 +478,7 @@ mod _schemars {
             "u256".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     description: Some("Radix-10 encoded 256-bit unsigned integer".to_owned()),
@@ -503,7 +503,7 @@ mod _schemars {
             "Base64".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     description: Some("Base64 encoded data".to_owned()),
@@ -528,7 +528,7 @@ mod _schemars {
             "Base58".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     description: Some("Base58 encoded data".to_owned()),
diff --git a/crates/iota-sdk-types/src/object.rs b/crates/iota-sdk-types/src/object.rs
index 1adc900a0..e17627d6e 100644
--- a/crates/iota-sdk-types/src/object.rs
+++ b/crates/iota-sdk-types/src/object.rs
@@ -705,8 +705,10 @@ mod serialization {
             ReadableObject::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableObject::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableObject::json_schema(generator)
         }
     }
 
@@ -902,8 +904,10 @@ mod serialization {
             ReadableGenesisObject::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableGenesisObject::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableGenesisObject::json_schema(generator)
         }
     }
 
diff --git a/crates/iota-sdk-types/src/serialization_proptests.rs b/crates/iota-sdk-types/src/serialization_proptests.rs
index 3c31eba1d..cce7951c0 100644
--- a/crates/iota-sdk-types/src/serialization_proptests.rs
+++ b/crates/iota-sdk-types/src/serialization_proptests.rs
@@ -39,7 +39,7 @@ fn assert_valid_json_schema<T>(instance: &T)
 where
     T: serde::Serialize + schemars::JsonSchema,
 {
-    let root_schema = schemars::gen::SchemaGenerator::default().into_root_schema_for::<T>();
+    let root_schema = schemars::r#gen::SchemaGenerator::default().into_root_schema_for::<T>();
     let schema = serde_json::json!(root_schema);
     let validator = jsonschema::Validator::new(&schema).unwrap();
     let instance = serde_json::json!(instance);
diff --git a/crates/iota-sdk-types/src/transaction/fixtures/update-transaction-fixtures/Cargo.toml b/crates/iota-sdk-types/src/transaction/fixtures/update-transaction-fixtures/Cargo.toml
index feb1646d4..caed22cb7 100644
--- a/crates/iota-sdk-types/src/transaction/fixtures/update-transaction-fixtures/Cargo.toml
+++ b/crates/iota-sdk-types/src/transaction/fixtures/update-transaction-fixtures/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "update_transaction_fixtures"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 bcs.workspace = true
diff --git a/crates/iota-sdk-types/src/transaction/serialization.rs b/crates/iota-sdk-types/src/transaction/serialization.rs
index 4bd459f5d..5b294fd92 100644
--- a/crates/iota-sdk-types/src/transaction/serialization.rs
+++ b/crates/iota-sdk-types/src/transaction/serialization.rs
@@ -49,8 +49,10 @@ mod transaction_kind {
             ReadableTransactionKind::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableTransactionKind::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableTransactionKind::json_schema(generator)
         }
     }
 
@@ -555,7 +557,7 @@ mod argument {
             "GasArgument".to_owned()
         }
 
-        fn json_schema(_gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             schemars::schema::Schema::Object(schemars::schema::SchemaObject {
                 instance_type: Some(schemars::schema::InstanceType::String.into()),
                 enum_values: Some(vec!["gas".into()]),
@@ -574,8 +576,10 @@ mod argument {
             ReadableArgument::schema_name()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-            ReadableArgument::json_schema(gen)
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
+            ReadableArgument::json_schema(generator)
         }
     }
 
@@ -1001,7 +1005,9 @@ mod transaction_expiration {
             "TransactionExpiration".into()
         }
 
-        fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(
+            generator: &mut schemars::r#gen::SchemaGenerator,
+        ) -> schemars::schema::Schema {
             use schemars::{
                 Map, Set,
                 schema::{
@@ -1015,7 +1021,7 @@ mod transaction_expiration {
                         let mut props = Map::new();
                         props.insert(
                             "epoch".to_owned(),
-                            gen.subschema_for::<crate::_schemars::U64>(),
+                            generator.subschema_for::<crate::_schemars::U64>(),
                         );
                         props
                     },
diff --git a/crates/iota-sdk-types/src/type_tag/serialization.rs b/crates/iota-sdk-types/src/type_tag/serialization.rs
index 63b6e8715..28e40de0f 100644
--- a/crates/iota-sdk-types/src/type_tag/serialization.rs
+++ b/crates/iota-sdk-types/src/type_tag/serialization.rs
@@ -261,7 +261,7 @@ mod json_schema {
             "Identifier".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     title: Some(Self::schema_name()),
@@ -285,7 +285,7 @@ mod json_schema {
             "TypeTag".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     title: Some(Self::schema_name()),
@@ -305,7 +305,7 @@ mod json_schema {
             "StructTag".to_owned()
         }
 
-        fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
             SchemaObject {
                 metadata: Some(Box::new(Metadata {
                     title: Some(Self::schema_name()),
diff --git a/crates/iota-sdk/Cargo.toml b/crates/iota-sdk/Cargo.toml
index ffc3e7248..cffc9b3b8 100644
--- a/crates/iota-sdk/Cargo.toml
+++ b/crates/iota-sdk/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iota-sdk"
 version = "3.0.0-alpha.1"
 authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 readme = "../../README.md"
 repository = "https://github.com/iotaledger/iota-rust-sdk/"
diff --git a/rustfmt.toml b/rustfmt.toml
index 4dc6b95de..726398bca 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,4 +1,4 @@
-edition = "2021"
+edition = "2024"
 style_edition = "2024"
 format_code_in_doc_comments = true
 group_imports = "StdExternalCrate"