clippy

jstuczyn · jstuczyn · commit c107c2c9a8db · 2025-05-19T11:58:53.000+01:00
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/key_rotation.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/key_rotation.rs
@@ -22,8 +22,7 @@ pub struct KeyRotationState {
 impl KeyRotationState {
     pub fn key_rotation_id(&self, current_epoch_id: EpochId) -> KeyRotationId {
         let diff = current_epoch_id.saturating_sub(self.initial_epoch_id);
-        let full_rots = diff / self.validity_epochs;
-        full_rots
+        diff / self.validity_epochs
     }
 
     pub fn next_rotation_starting_epoch_id(&self, current_epoch_id: EpochId) -> EpochId {
diff --git a/common/http-api-client/src/lib.rs b/common/http-api-client/src/lib.rs
@@ -444,6 +444,9 @@ impl Client {
         Client {
             base_url: new_url,
             reqwest_client: self.reqwest_client.clone(),
+
+            #[cfg(target_arch = "wasm32")]
+            request_timeout: self.request_timeout,
         }
     }
 
diff --git a/common/nymsphinx/params/src/packet_version.rs b/common/nymsphinx/params/src/packet_version.rs
@@ -10,8 +10,8 @@ use thiserror::Error;
 // - packet_version (starting with v1.1.0)
 // - packet_size indicator
 // - packet_type
-// - sphinx key rotation (starting with v1.11.0)
-const TODO: &str = "update the ^ version number when this PR is almost ready";
+// - sphinx key rotation (starting with v1.12.0/v1.13.0 - either Cheddar or Dolcelatte release)
+
 // it also just so happens that the only valid values for packet_size indicator include values 1-6
 // therefore if we receive byte `7` (or larger than that) we'll know we received a versioned packet,
 // otherwise we should treat it as legacy
diff --git a/contracts/mixnet/schema/nym-mixnet-contract.json b/contracts/mixnet/schema/nym-mixnet-contract.json
@@ -3440,6 +3440,34 @@
           }
         },
         "additionalProperties": false
+      },
+      {
+        "description": "Gets the current state config of the key rotation (i.e. starting epoch id and validity duration)",
+        "type": "object",
+        "required": [
+          "get_key_rotation_state"
+        ],
+        "properties": {
+          "get_key_rotation_state": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Gets the current key rotation id",
+        "type": "object",
+        "required": [
+          "get_key_rotation_id"
+        ],
+        "properties": {
+          "get_key_rotation_id": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
       }
     ],
     "definitions": {
@@ -5116,6 +5144,46 @@
         }
       }
     },
+    "get_key_rotation_id": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "KeyRotationIdResponse",
+      "type": "object",
+      "required": [
+        "rotation_id"
+      ],
+      "properties": {
+        "rotation_id": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "get_key_rotation_state": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "KeyRotationState",
+      "type": "object",
+      "required": [
+        "initial_epoch_id",
+        "validity_epochs"
+      ],
+      "properties": {
+        "initial_epoch_id": {
+          "description": "Records the initial epoch_id when the key rotation has been introduced (0 for fresh contracts). It is used for determining when rotation is meant to advance.",
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        },
+        "validity_epochs": {
+          "description": "Defines how long each key rotation is valid for (in terms of epochs)",
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
     "get_mix_node_bonds": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "PagedMixnodeBondsResponse",
diff --git a/contracts/mixnet/schema/raw/query.json b/contracts/mixnet/schema/raw/query.json
@@ -1486,6 +1486,34 @@
         }
       },
       "additionalProperties": false
+    },
+    {
+      "description": "Gets the current state config of the key rotation (i.e. starting epoch id and validity duration)",
+      "type": "object",
+      "required": [
+        "get_key_rotation_state"
+      ],
+      "properties": {
+        "get_key_rotation_state": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Gets the current key rotation id",
+      "type": "object",
+      "required": [
+        "get_key_rotation_id"
+      ],
+      "properties": {
+        "get_key_rotation_id": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
     }
   ],
   "definitions": {
diff --git a/contracts/mixnet/schema/raw/response_to_get_key_rotation_id.json b/contracts/mixnet/schema/raw/response_to_get_key_rotation_id.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "KeyRotationIdResponse",
+  "type": "object",
+  "required": [
+    "rotation_id"
+  ],
+  "properties": {
+    "rotation_id": {
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/contracts/mixnet/schema/raw/response_to_get_key_rotation_state.json b/contracts/mixnet/schema/raw/response_to_get_key_rotation_state.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "KeyRotationState",
+  "type": "object",
+  "required": [
+    "initial_epoch_id",
+    "validity_epochs"
+  ],
+  "properties": {
+    "initial_epoch_id": {
+      "description": "Records the initial epoch_id when the key rotation has been introduced (0 for fresh contracts). It is used for determining when rotation is meant to advance.",
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    },
+    "validity_epochs": {
+      "description": "Defines how long each key rotation is valid for (in terms of epochs)",
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/contracts/mixnet/src/rewards/transactions.rs b/contracts/mixnet/src/rewards/transactions.rs
@@ -313,6 +313,8 @@ pub(crate) fn try_update_rewarding_params(
     }
 }
 
+#[allow(clippy::panic)]
+#[allow(clippy::unreachable)]
 #[cfg(test)]
 pub mod tests {
     use super::*;
diff --git a/nym-node/src/node/key_rotation/controller.rs b/nym-node/src/node/key_rotation/controller.rs
@@ -198,7 +198,6 @@ impl KeyRotationController {
         {
             // mutex poisoning - we have to exit
             self.shutdown_token.cancel();
-            return;
         }
 
         // no need to send the information explicitly to nym-apis, as they're scheduled to refresh
@@ -217,7 +216,6 @@ impl KeyRotationController {
         {
             // mutex poisoning - we have to exit
             self.shutdown_token.cancel();
-            return;
         }
     }
 
@@ -229,7 +227,6 @@ impl KeyRotationController {
         if self.replay_protection_manager.purge_secondary().is_err() {
             // mutex poisoning - we have to exit
             self.shutdown_token.cancel();
-            return;
         }
     }
 
diff --git a/nym-node/src/node/replay_protection/bloomfilter.rs b/nym-node/src/node/replay_protection/bloomfilter.rs
@@ -238,18 +238,21 @@ impl ReplayProtectionBloomfilters {
     }
 }
 
+// map from particular rotation id to vector of results, based on the order of requests received
+type BatchCheckResult = HashMap<u32, Vec<bool>>;
+
 impl ReplayProtectionBloomfilters {
     pub(crate) fn batch_try_check_and_set(
         &self,
         reply_tags: &HashMap<u32, Vec<&[u8; REPLAY_TAG_SIZE]>>,
-    ) -> Option<Result<HashMap<u32, Vec<bool>>, PoisonError<()>>> {
+    ) -> Option<Result<BatchCheckResult, PoisonError<()>>> {
         let mut guard = match self.inner.try_lock() {
             Ok(guard) => guard,
             Err(TryLockError::Poisoned(_)) => return Some(Err(PoisonError::new(()))),
             Err(TryLockError::WouldBlock) => return None,
         };
 
-        Some(Ok(guard.batch_check_and_set(&reply_tags)))
+        Some(Ok(guard.batch_check_and_set(reply_tags)))
     }
 
     pub(crate) fn batch_check_and_set(
@@ -260,7 +263,7 @@ impl ReplayProtectionBloomfilters {
             return Err(PoisonError::new(()));
         };
 
-        Ok(guard.batch_check_and_set(&reply_tags))
+        Ok(guard.batch_check_and_set(reply_tags))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@ pub struct KeyRotationState {`
`22`	`22`	`impl KeyRotationState {`
`23`	`23`	`pub fn key_rotation_id(&self, current_epoch_id: EpochId) -> KeyRotationId {`
`24`	`24`	`let diff = current_epoch_id.saturating_sub(self.initial_epoch_id);`
`25`		`- let full_rots = diff / self.validity_epochs;`
`26`		`- full_rots`
	`25`	`+ diff / self.validity_epochs`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`pub fn next_rotation_starting_epoch_id(&self, current_epoch_id: EpochId) -> EpochId {`
Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,9 @@ impl Client {`
`444`	`444`	`Client {`
`445`	`445`	`base_url: new_url,`
`446`	`446`	`reqwest_client: self.reqwest_client.clone(),`
	`447`	`+`
	`448`	`+ #[cfg(target_arch = "wasm32")]`
	`449`	`+ request_timeout: self.request_timeout,`
`447`	`450`	`}`
`448`	`451`	`}`
`449`	`452`
Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ pub(crate) fn try_update_rewarding_params(`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`
	`316`	`+#[allow(clippy::panic)]`
	`317`	`+#[allow(clippy::unreachable)]`
`316`	`318`	`#[cfg(test)]`
`317`	`319`	`pub mod tests {`
`318`	`320`	`use super::*;`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,6 @@ impl KeyRotationController {`
`198`	`198`	`{`
`199`	`199`	`// mutex poisoning - we have to exit`
`200`	`200`	`self.shutdown_token.cancel();`
`201`		`- return;`
`202`	`201`	`}`
`203`	`202`
`204`	`203`	`// no need to send the information explicitly to nym-apis, as they're scheduled to refresh`
`@@ -217,7 +216,6 @@ impl KeyRotationController {`
`217`	`216`	`{`
`218`	`217`	`// mutex poisoning - we have to exit`
`219`	`218`	`self.shutdown_token.cancel();`
`220`		`- return;`
`221`	`219`	`}`
`222`	`220`	`}`
`223`	`221`
`@@ -229,7 +227,6 @@ impl KeyRotationController {`
`229`	`227`	`if self.replay_protection_manager.purge_secondary().is_err() {`
`230`	`228`	`// mutex poisoning - we have to exit`
`231`	`229`	`self.shutdown_token.cancel();`
`232`		`- return;`
`233`	`230`	`}`
`234`	`231`	`}`
`235`	`232`
Original file line number	Diff line number	Diff line change
`@@ -238,18 +238,21 @@ impl ReplayProtectionBloomfilters {`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
	`241`	`+// map from particular rotation id to vector of results, based on the order of requests received`
	`242`	`+type BatchCheckResult = HashMap<u32, Vec<bool>>;`
	`243`	`+`
`241`	`244`	`impl ReplayProtectionBloomfilters {`
`242`	`245`	`pub(crate) fn batch_try_check_and_set(`
`243`	`246`	`&self,`
`244`	`247`	`reply_tags: &HashMap<u32, Vec<&[u8; REPLAY_TAG_SIZE]>>,`
`245`		`- ) -> Option<Result<HashMap<u32, Vec<bool>>, PoisonError<()>>> {`
	`248`	`+ ) -> Option<Result<BatchCheckResult, PoisonError<()>>> {`
`246`	`249`	`let mut guard = match self.inner.try_lock() {`
`247`	`250`	`Ok(guard) => guard,`
`248`	`251`	`Err(TryLockError::Poisoned(_)) => return Some(Err(PoisonError::new(()))),`
`249`	`252`	`Err(TryLockError::WouldBlock) => return None,`
`250`	`253`	`};`
`251`	`254`
`252`		`- Some(Ok(guard.batch_check_and_set(&reply_tags)))`
	`255`	`+ Some(Ok(guard.batch_check_and_set(reply_tags)))`
`253`	`256`	`}`
`254`	`257`
`255`	`258`	`pub(crate) fn batch_check_and_set(`
`@@ -260,7 +263,7 @@ impl ReplayProtectionBloomfilters {`
`260`	`263`	`return Err(PoisonError::new(()));`
`261`	`264`	`};`
`262`	`265`
`263`		`- Ok(guard.batch_check_and_set(&reply_tags))`
	`266`	`+ Ok(guard.batch_check_and_set(reply_tags))`
`264`	`267`	`}`
`265`	`268`	`}`
`266`	`269`