Skip to content

chore: Avoid cloning IDKG artifacts when converting from/to protobuf #8827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eichhorl wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

chore: Avoid cloning IDKG artifacts when converting from/to protobuf #8827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19f41dc
clones
eichhorl Feb 12, 2026
887795c
fix
eichhorl Feb 12, 2026
e57d605
fix
eichhorl Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rs/p2p/artifact_downloader/src/fetch_stripped_artifact/types/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ impl TryFrom<pb::GetIDkgDealingInBlockResponse> for GetIDkgDealingInBlockRespons

fn try_from(value: pb::GetIDkgDealingInBlockResponse) -> Result<Self, Self::Error> {
Ok(Self {
signed_dealing: try_from_option_field(value.signed_dealing.as_ref(), "signed_dealing")?,
signed_dealing: try_from_option_field(value.signed_dealing, "signed_dealing")?,
})
}
}

impl From<GetIDkgDealingInBlockResponse> for pb::GetIDkgDealingInBlockResponse {
fn from(value: GetIDkgDealingInBlockResponse) -> Self {
pb::GetIDkgDealingInBlockResponse {
signed_dealing: Some((&value.signed_dealing).into()),
signed_dealing: Some(value.signed_dealing.into()),
}
}
}
Expand Down
116 changes: 54 additions & 62 deletions rs/types/types/src/consensus/idkg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ impl IDkgMessage {
impl From<IDkgMessage> for pb::IDkgMessage {
fn from(value: IDkgMessage) -> Self {
use pb::i_dkg_message::Msg;
let msg = match &value {
let msg = match value {
IDkgMessage::Dealing(x) => Msg::SignedDealing(x.into()),
IDkgMessage::DealingSupport(x) => Msg::DealingSupport(x.into()),
IDkgMessage::EcdsaSigShare(x) => Msg::EcdsaSigShare(x.into()),
Expand All @@ -935,10 +935,10 @@ impl TryFrom<pb::IDkgMessage> for IDkgMessage {

fn try_from(proto: pb::IDkgMessage) -> Result<Self, Self::Error> {
use pb::i_dkg_message::Msg;
let Some(msg) = &proto.msg else {
let Some(msg) = proto.msg else {
return Err(ProxyDecodeError::MissingField("IDkgMessage::msg"));
};
Ok(match &msg {
Ok(match msg {
Msg::SignedDealing(x) => IDkgMessage::Dealing(x.try_into()?),
Msg::DealingSupport(x) => IDkgMessage::DealingSupport(x.try_into()?),
Msg::EcdsaSigShare(x) => IDkgMessage::EcdsaSigShare(x.try_into()?),
Expand Down Expand Up @@ -1443,27 +1443,27 @@ pub struct EcdsaSigShare {
pub share: ThresholdEcdsaSigShare,
}

impl From<&EcdsaSigShare> for pb::EcdsaSigShare {
fn from(value: &EcdsaSigShare) -> Self {
impl From<EcdsaSigShare> for pb::EcdsaSigShare {
fn from(value: EcdsaSigShare) -> Self {
Self {
signer_id: Some(node_id_into_protobuf(value.signer_id)),
request_id: Some(pb::RequestId::from(value.request_id)),
sig_share_raw: value.share.sig_share_raw.clone(),
sig_share_raw: value.share.sig_share_raw,
}
}
}

impl TryFrom<&pb::EcdsaSigShare> for EcdsaSigShare {
impl TryFrom<pb::EcdsaSigShare> for EcdsaSigShare {
type Error = ProxyDecodeError;
fn try_from(value: &pb::EcdsaSigShare) -> Result<Self, Self::Error> {
fn try_from(value: pb::EcdsaSigShare) -> Result<Self, Self::Error> {
Ok(Self {
signer_id: node_id_try_from_option(value.signer_id.clone())?,
signer_id: node_id_try_from_option(value.signer_id)?,
request_id: try_from_option_field(
value.request_id.as_ref(),
"EcdsaSigShare::request_id",
)?,
share: ThresholdEcdsaSigShare {
sig_share_raw: value.sig_share_raw.clone(),
sig_share_raw: value.sig_share_raw,
},
})
}
Expand Down Expand Up @@ -1492,27 +1492,27 @@ pub struct SchnorrSigShare {
pub share: ThresholdSchnorrSigShare,
}

impl From<&SchnorrSigShare> for pb::SchnorrSigShare {
fn from(value: &SchnorrSigShare) -> Self {
impl From<SchnorrSigShare> for pb::SchnorrSigShare {
fn from(value: SchnorrSigShare) -> Self {
Self {
signer_id: Some(node_id_into_protobuf(value.signer_id)),
request_id: Some(pb::RequestId::from(value.request_id)),
sig_share_raw: value.share.sig_share_raw.clone(),
sig_share_raw: value.share.sig_share_raw,
}
}
}

impl TryFrom<&pb::SchnorrSigShare> for SchnorrSigShare {
impl TryFrom<pb::SchnorrSigShare> for SchnorrSigShare {
type Error = ProxyDecodeError;
fn try_from(value: &pb::SchnorrSigShare) -> Result<Self, Self::Error> {
fn try_from(value: pb::SchnorrSigShare) -> Result<Self, Self::Error> {
Ok(Self {
signer_id: node_id_try_from_option(value.signer_id.clone())?,
signer_id: node_id_try_from_option(value.signer_id)?,
request_id: try_from_option_field(
value.request_id.as_ref(),
"SchnorrSigShare::request_id",
)?,
share: ThresholdSchnorrSigShare {
sig_share_raw: value.sig_share_raw.clone(),
sig_share_raw: value.sig_share_raw,
},
})
}
Expand Down Expand Up @@ -1541,31 +1541,29 @@ pub struct VetKdKeyShare {
pub share: VetKdEncryptedKeyShare,
}

impl From<&VetKdKeyShare> for pb::VetKdKeyShare {
fn from(value: &VetKdKeyShare) -> Self {
impl From<VetKdKeyShare> for pb::VetKdKeyShare {
fn from(value: VetKdKeyShare) -> Self {
Self {
signer_id: Some(node_id_into_protobuf(value.signer_id)),
request_id: Some(pb::RequestId::from(value.request_id)),
encrypted_key_share: value.share.encrypted_key_share.0.clone(),
node_signature: value.share.node_signature.clone(),
encrypted_key_share: value.share.encrypted_key_share.0,
node_signature: value.share.node_signature,
}
}
}

impl TryFrom<&pb::VetKdKeyShare> for VetKdKeyShare {
impl TryFrom<pb::VetKdKeyShare> for VetKdKeyShare {
type Error = ProxyDecodeError;
fn try_from(value: &pb::VetKdKeyShare) -> Result<Self, Self::Error> {
fn try_from(value: pb::VetKdKeyShare) -> Result<Self, Self::Error> {
Ok(Self {
signer_id: node_id_try_from_option(value.signer_id.clone())?,
signer_id: node_id_try_from_option(value.signer_id)?,
request_id: try_from_option_field(
value.request_id.as_ref(),
"VetKdKeyShare::request_id",
)?,
share: VetKdEncryptedKeyShare {
encrypted_key_share: VetKdEncryptedKeyShareContent(
value.encrypted_key_share.clone(),
),
node_signature: value.node_signature.clone(),
encrypted_key_share: VetKdEncryptedKeyShareContent(value.encrypted_key_share),
node_signature: value.node_signature,
},
})
}
Expand Down Expand Up @@ -1638,42 +1636,39 @@ impl SignedIDkgComplaint {
}
}

impl From<&SignedIDkgComplaint> for pb::SignedIDkgComplaint {
fn from(value: &SignedIDkgComplaint) -> Self {
impl From<SignedIDkgComplaint> for pb::SignedIDkgComplaint {
fn from(value: SignedIDkgComplaint) -> Self {
Self {
content: Some((&value.content).into()),
signature: Some(value.signature.clone().into()),
content: Some(value.content.into()),
signature: Some(value.signature.into()),
}
}
}

impl TryFrom<&pb::SignedIDkgComplaint> for SignedIDkgComplaint {
impl TryFrom<pb::SignedIDkgComplaint> for SignedIDkgComplaint {
type Error = ProxyDecodeError;
fn try_from(value: &pb::SignedIDkgComplaint) -> Result<Self, Self::Error> {
fn try_from(value: pb::SignedIDkgComplaint) -> Result<Self, Self::Error> {
Ok(Self {
content: try_from_option_field(value.content.as_ref(), "SignedIDkgComplaint::content")?,
signature: try_from_option_field(
value.signature.clone(),
"SignedIDkgComplaint::signature",
)?,
content: try_from_option_field(value.content, "SignedIDkgComplaint::content")?,
signature: try_from_option_field(value.signature, "SignedIDkgComplaint::signature")?,
})
}
}

impl From<&IDkgComplaintContent> for pb::IDkgComplaintContent {
fn from(value: &IDkgComplaintContent) -> Self {
impl From<IDkgComplaintContent> for pb::IDkgComplaintContent {
fn from(value: IDkgComplaintContent) -> Self {
Self {
idkg_complaint: Some((&value.idkg_complaint).into()),
idkg_complaint: Some(value.idkg_complaint.into()),
}
}
}

impl TryFrom<&pb::IDkgComplaintContent> for IDkgComplaintContent {
impl TryFrom<pb::IDkgComplaintContent> for IDkgComplaintContent {
type Error = ProxyDecodeError;
fn try_from(value: &pb::IDkgComplaintContent) -> Result<Self, Self::Error> {
fn try_from(value: pb::IDkgComplaintContent) -> Result<Self, Self::Error> {
Ok(Self {
idkg_complaint: try_from_option_field(
value.idkg_complaint.as_ref(),
value.idkg_complaint,
"IDkgComplaintContent::idkg_complaint",
)?,
})
Expand Down Expand Up @@ -1718,42 +1713,39 @@ impl SignedIDkgOpening {
}
}

impl From<&SignedIDkgOpening> for pb::SignedIDkgOpening {
fn from(value: &SignedIDkgOpening) -> Self {
impl From<SignedIDkgOpening> for pb::SignedIDkgOpening {
fn from(value: SignedIDkgOpening) -> Self {
Self {
content: Some((&value.content).into()),
signature: Some(value.signature.clone().into()),
content: Some(value.content.into()),
signature: Some(value.signature.into()),
}
}
}

impl TryFrom<&pb::SignedIDkgOpening> for SignedIDkgOpening {
impl TryFrom<pb::SignedIDkgOpening> for SignedIDkgOpening {
type Error = ProxyDecodeError;
fn try_from(value: &pb::SignedIDkgOpening) -> Result<Self, Self::Error> {
fn try_from(value: pb::SignedIDkgOpening) -> Result<Self, Self::Error> {
Ok(Self {
content: try_from_option_field(value.content.as_ref(), "SignedIDkgOpening::content")?,
signature: try_from_option_field(
value.signature.clone(),
"SignedIDkgOpening::signature",
)?,
content: try_from_option_field(value.content, "SignedIDkgOpening::content")?,
signature: try_from_option_field(value.signature, "SignedIDkgOpening::signature")?,
})
}
}

impl From<&IDkgOpeningContent> for pb::IDkgOpeningContent {
fn from(value: &IDkgOpeningContent) -> Self {
impl From<IDkgOpeningContent> for pb::IDkgOpeningContent {
fn from(value: IDkgOpeningContent) -> Self {
Self {
idkg_opening: Some((&value.idkg_opening).into()),
idkg_opening: Some(value.idkg_opening.into()),
}
}
}

impl TryFrom<&pb::IDkgOpeningContent> for IDkgOpeningContent {
impl TryFrom<pb::IDkgOpeningContent> for IDkgOpeningContent {
type Error = ProxyDecodeError;
fn try_from(value: &pb::IDkgOpeningContent) -> Result<Self, Self::Error> {
fn try_from(value: pb::IDkgOpeningContent) -> Result<Self, Self::Error> {
Ok(Self {
idkg_opening: try_from_option_field(
value.idkg_opening.as_ref(),
value.idkg_opening,
"IDkgOpeningContent::idkg_opening",
)?,
})
Expand Down
Loading
Loading