Skip to content

Commit f0e6f87

Browse files
authored
chore: Remove deprecated EcdsaConfig (#5899)
These types are no longer in use since they were superseded by the `ChainKeyConfig`.
1 parent d366536 commit f0e6f87

File tree

8 files changed

+2
-117
lines changed

8 files changed

+2
-117
lines changed

rs/protobuf/def/registry/subnet/v1/subnet.proto

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -301,24 +301,6 @@ message SubnetFeatures {
301301
optional bool sev_enabled = 9;
302302
}
303303

304-
// Per subnet ECDSA configuration
305-
//
306-
// Deprecated; please use ChainKeyConfig instead.
307-
message EcdsaConfig {
308-
// Number of quadruples to create in advance.
309-
uint32 quadruples_to_create_in_advance = 1;
310-
reserved 2;
311-
// Identifiers for threshold ECDSA keys held by the subnet.
312-
repeated types.v1.EcdsaKeyId key_ids = 3;
313-
// The maximum number of signature requests that can be enqueued at once.
314-
uint32 max_queue_size = 4;
315-
// Signature requests will timeout after the given number of nano seconds.
316-
optional uint64 signature_request_timeout_ns = 5;
317-
// Key rotation period of a single node in milliseconds.
318-
// If none is specified key rotation is disabled.
319-
optional uint64 idkg_key_rotation_period_ms = 6;
320-
}
321-
322304
message KeyConfig {
323305
// The key's identifier.
324306
optional types.v1.MasterPublicKeyId key_id = 1;

rs/protobuf/generator/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,6 @@ fn build_registry_proto(def: &Path, out: &Path) {
213213
".registry.subnet",
214214
"#[derive(serde::Serialize, serde::Deserialize)]",
215215
);
216-
config.type_attribute(
217-
".registry.subnet.v1.EcdsaConfig",
218-
"#[derive(candid::CandidType, Eq)]",
219-
);
220216
config.type_attribute(
221217
".registry.subnet.v1.SubnetFeatures",
222218
"#[derive(candid::CandidType, Eq)]",

rs/protobuf/src/gen/registry/registry.subnet.v1.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -311,30 +311,6 @@ pub struct SubnetFeatures {
311311
#[prost(bool, optional, tag = "9")]
312312
pub sev_enabled: ::core::option::Option<bool>,
313313
}
314-
/// Per subnet ECDSA configuration
315-
///
316-
/// Deprecated; please use ChainKeyConfig instead.
317-
#[derive(
318-
serde::Serialize, serde::Deserialize, candid::CandidType, Eq, Clone, PartialEq, ::prost::Message,
319-
)]
320-
pub struct EcdsaConfig {
321-
/// Number of quadruples to create in advance.
322-
#[prost(uint32, tag = "1")]
323-
pub quadruples_to_create_in_advance: u32,
324-
/// Identifiers for threshold ECDSA keys held by the subnet.
325-
#[prost(message, repeated, tag = "3")]
326-
pub key_ids: ::prost::alloc::vec::Vec<super::super::super::types::v1::EcdsaKeyId>,
327-
/// The maximum number of signature requests that can be enqueued at once.
328-
#[prost(uint32, tag = "4")]
329-
pub max_queue_size: u32,
330-
/// Signature requests will timeout after the given number of nano seconds.
331-
#[prost(uint64, optional, tag = "5")]
332-
pub signature_request_timeout_ns: ::core::option::Option<u64>,
333-
/// Key rotation period of a single node in milliseconds.
334-
/// If none is specified key rotation is disabled.
335-
#[prost(uint64, optional, tag = "6")]
336-
pub idkg_key_rotation_period_ms: ::core::option::Option<u64>,
337-
}
338314
#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
339315
pub struct KeyConfig {
340316
/// The key's identifier.

rs/protobuf/src/gen/state/registry.subnet.v1.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -302,28 +302,6 @@ pub struct SubnetFeatures {
302302
#[prost(bool, optional, tag = "9")]
303303
pub sev_enabled: ::core::option::Option<bool>,
304304
}
305-
/// Per subnet ECDSA configuration
306-
///
307-
/// Deprecated; please use ChainKeyConfig instead.
308-
#[derive(Clone, PartialEq, ::prost::Message)]
309-
pub struct EcdsaConfig {
310-
/// Number of quadruples to create in advance.
311-
#[prost(uint32, tag = "1")]
312-
pub quadruples_to_create_in_advance: u32,
313-
/// Identifiers for threshold ECDSA keys held by the subnet.
314-
#[prost(message, repeated, tag = "3")]
315-
pub key_ids: ::prost::alloc::vec::Vec<super::super::super::types::v1::EcdsaKeyId>,
316-
/// The maximum number of signature requests that can be enqueued at once.
317-
#[prost(uint32, tag = "4")]
318-
pub max_queue_size: u32,
319-
/// Signature requests will timeout after the given number of nano seconds.
320-
#[prost(uint64, optional, tag = "5")]
321-
pub signature_request_timeout_ns: ::core::option::Option<u64>,
322-
/// Key rotation period of a single node in milliseconds.
323-
/// If none is specified key rotation is disabled.
324-
#[prost(uint64, optional, tag = "6")]
325-
pub idkg_key_rotation_period_ms: ::core::option::Option<u64>,
326-
}
327305
#[derive(Clone, PartialEq, ::prost::Message)]
328306
pub struct KeyConfig {
329307
/// The key's identifier.

rs/protobuf/src/gen/types/registry.subnet.v1.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -302,28 +302,6 @@ pub struct SubnetFeatures {
302302
#[prost(bool, optional, tag = "9")]
303303
pub sev_enabled: ::core::option::Option<bool>,
304304
}
305-
/// Per subnet ECDSA configuration
306-
///
307-
/// Deprecated; please use ChainKeyConfig instead.
308-
#[derive(Clone, PartialEq, ::prost::Message)]
309-
pub struct EcdsaConfig {
310-
/// Number of quadruples to create in advance.
311-
#[prost(uint32, tag = "1")]
312-
pub quadruples_to_create_in_advance: u32,
313-
/// Identifiers for threshold ECDSA keys held by the subnet.
314-
#[prost(message, repeated, tag = "3")]
315-
pub key_ids: ::prost::alloc::vec::Vec<super::super::super::types::v1::EcdsaKeyId>,
316-
/// The maximum number of signature requests that can be enqueued at once.
317-
#[prost(uint32, tag = "4")]
318-
pub max_queue_size: u32,
319-
/// Signature requests will timeout after the given number of nano seconds.
320-
#[prost(uint64, optional, tag = "5")]
321-
pub signature_request_timeout_ns: ::core::option::Option<u64>,
322-
/// Key rotation period of a single node in milliseconds.
323-
/// If none is specified key rotation is disabled.
324-
#[prost(uint64, optional, tag = "6")]
325-
pub idkg_key_rotation_period_ms: ::core::option::Option<u64>,
326-
}
327305
#[derive(Clone, PartialEq, ::prost::Message)]
328306
pub struct KeyConfig {
329307
/// The key's identifier.

rs/registry/canister/canister/registry.did

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,6 @@ type VetKdKeyId = record { curve: VetKdCurve; name: text };
159159

160160
type VetKdCurve = variant { bls12_381_g2 };
161161

162-
type EcdsaConfig = record {
163-
quadruples_to_create_in_advance : nat32;
164-
max_queue_size : opt nat32;
165-
key_ids : vec EcdsaKeyId;
166-
signature_request_timeout_ns : opt nat64;
167-
idkg_key_rotation_period_ms : opt nat64;
168-
};
169-
170162
type EcdsaCurve = variant { secp256k1 };
171163

172164
type EcdsaInitialConfig = record {

rs/registry/canister/canister/registry_test.did

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,6 @@ type VetKdKeyId = record { curve: VetKdCurve; name: text };
159159

160160
type VetKdCurve = variant { bls12_381_g2 };
161161

162-
type EcdsaConfig = record {
163-
quadruples_to_create_in_advance : nat32;
164-
max_queue_size : opt nat32;
165-
key_ids : vec EcdsaKeyId;
166-
signature_request_timeout_ns : opt nat64;
167-
idkg_key_rotation_period_ms : opt nat64;
168-
};
169-
170162
type EcdsaCurve = variant { secp256k1 };
171163

172164
type EcdsaInitialConfig = record {

rs/registry/subnet_features/src/lib.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use candid::CandidType;
2-
use ic_management_canister_types_private::{EcdsaKeyId, MasterPublicKeyId};
2+
use ic_management_canister_types_private::MasterPublicKeyId;
33
use ic_protobuf::types::v1 as pb_types;
44
use ic_protobuf::{
55
proxy::{try_from_option_field, ProxyDecodeError},
@@ -88,15 +88,6 @@ impl FromStr for SubnetFeatures {
8888
}
8989
}
9090

91-
#[derive(Clone, Eq, PartialEq, Debug, Default, CandidType, Deserialize, Serialize)]
92-
pub struct EcdsaConfig {
93-
pub quadruples_to_create_in_advance: u32,
94-
pub key_ids: Vec<EcdsaKeyId>,
95-
pub max_queue_size: Option<u32>,
96-
pub signature_request_timeout_ns: Option<u64>,
97-
pub idkg_key_rotation_period_ms: Option<u64>,
98-
}
99-
10091
#[derive(Clone, Eq, PartialEq, Debug, CandidType, Deserialize, Serialize)]
10192
pub struct KeyConfig {
10293
pub key_id: MasterPublicKeyId,
@@ -194,7 +185,7 @@ impl TryFrom<pb::ChainKeyConfig> for ChainKeyConfig {
194185

195186
#[cfg(test)]
196187
mod tests {
197-
use ic_management_canister_types_private::{EcdsaCurve, VetKdCurve, VetKdKeyId};
188+
use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId, VetKdCurve, VetKdKeyId};
198189

199190
use super::*;
200191
use std::str::FromStr;

0 commit comments

Comments
 (0)