Skip to content

Commit b4a8ba6

Browse files
AlenarAlenar
committed
Fix ProtocolInitializer deserialization from signer database
1 parent 783fb79 commit b4a8ba6

File tree

1 file changed

+56
-10
lines changed

1 file changed

+56
-10
lines changed

‎mithril-common/src/crypto_helper/cardano/key_certification.rs‎

Lines changed: 56 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pub enum ProtocolInitializerErrorWrapper {
9797
#[derive(Debug, Clone, Serialize, Deserialize)]
9898
pub struct StmInitializerWrapper {
9999
stm_initializer: StmInitializer,
100-
kes_signature: Option<ProtocolSignerVerificationKeySignature>, // todo: The option is ONLY for a smooth transition. We have to remove this.
100+
kes_signature: Option<Sum6KesSig>, // todo: The option is ONLY for a smooth transition. We have to remove this.
101101
}
102102

103103
/// Wrapper structure for [MithrilStm:KeyReg](mithril_stm::key_reg::KeyReg).
@@ -144,11 +144,7 @@ impl StmInitializerWrapper {
144144
.map_err(|_| ProtocolInitializerErrorWrapper::KesUpdate(period))?;
145145
}
146146

147-
Some(
148-
kes_sk
149-
.sign(&stm_initializer.verification_key().to_bytes())
150-
.into(),
151-
)
147+
Some(kes_sk.sign(&stm_initializer.verification_key().to_bytes()))
152148
} else {
153149
println!("WARNING: Non certified signer registration by providing only a Pool Id is decommissionned and must be used for tests only!");
154150
None
@@ -167,7 +163,7 @@ impl StmInitializerWrapper {
167163

168164
/// Extract the verification key signature.
169165
pub fn verification_key_signature(&self) -> Option<ProtocolSignerVerificationKeySignature> {
170-
self.kes_signature.clone()
166+
self.kes_signature.map(|k| k.into())
171167
}
172168

173169
/// Extract the protocol parameters of the initializer
@@ -220,7 +216,7 @@ impl StmInitializerWrapper {
220216

221217
Ok(Self {
222218
stm_initializer,
223-
kes_signature: Some(kes_signature.into()),
219+
kes_signature: Some(kes_signature),
224220
})
225221
}
226222
}
@@ -368,7 +364,7 @@ mod test {
368364
let key_registration_1 = key_reg.register(
369365
None,
370366
Some(opcert1),
371-
initializer_1.kes_signature,
367+
initializer_1.verification_key_signature(),
372368
Some(0),
373369
initializer_1.stm_initializer.verification_key().into(),
374370
);
@@ -390,10 +386,60 @@ mod test {
390386
let key_registration_2 = key_reg.register(
391387
None,
392388
Some(opcert2),
393-
initializer_2.kes_signature,
389+
initializer_2.verification_key_signature(),
394390
Some(0),
395391
initializer_2.stm_initializer.verification_key().into(),
396392
);
397393
assert!(key_registration_2.is_ok())
398394
}
395+
396+
#[test]
397+
fn golden_initializer_deserialization() {
398+
let string = r#"
399+
{
400+
"stm_initializer": {
401+
"stake": 9497432569,
402+
"params": {
403+
"m": 20973,
404+
"k": 2422,
405+
"phi_f": 0.2
406+
},
407+
"sk": [49, 181, 118, 110, 190, 161, 107, 218, 165, 20, 147, 129, 193, 79, 160, 0, 37, 23, 102, 223, 88, 174, 208, 70, 97, 79, 174, 51, 28, 0, 192, 210],
408+
"pk": {
409+
"vk": [173, 149, 133, 21, 100, 254, 36, 74, 165, 174, 56, 9, 145, 190, 48, 14, 12, 193, 243, 3, 200, 148, 221, 124, 170, 143, 89, 5, 168, 0, 226, 125, 61, 181, 190, 80, 62, 199, 99, 161, 117, 49, 65, 34, 81, 96, 34, 81, 2, 235, 173, 57, 58, 128, 49, 22, 242, 42, 30, 137, 6, 51, 77, 57, 142, 192, 140, 161, 206, 206, 213, 114, 156, 191, 127, 167, 167, 9, 39, 29, 97, 166, 134, 76, 55, 179, 72, 29, 41, 251, 14, 71, 89, 181, 31, 115],
410+
"pop": [171, 0, 214, 91, 37, 208, 228, 71, 228, 31, 138, 0, 237, 175, 24, 45, 160, 117, 14, 210, 23, 46, 235, 83, 45, 9, 58, 207, 18, 36, 31, 160, 252, 111, 69, 102, 248, 205, 46, 71, 24, 38, 41, 77, 29, 129, 95, 16, 136, 114, 250, 44, 230, 184, 222, 122, 120, 58, 249, 103, 48, 121, 141, 244, 243, 26, 252, 60, 230, 64, 75, 3, 86, 107, 198, 198, 117, 242, 107, 104, 219, 209, 211, 255, 174, 203, 43, 141, 34, 146, 25, 181, 212, 38, 194, 99]
411+
}
412+
},
413+
"kes_signature": {
414+
"sigma": {
415+
"sigma": {
416+
"sigma": {
417+
"sigma": {
418+
"sigma": {
419+
"sigma": [71, 225, 146, 98, 81, 62, 28, 21, 7, 157, 88, 4, 226, 126, 27, 133, 146, 171, 216, 170, 77, 17, 38, 146, 98, 202, 35, 87, 166, 162, 25, 207, 105, 174, 48, 225, 152, 68, 19, 109, 72, 241, 69, 111, 22, 214, 72, 20, 81, 56, 181, 104, 69, 121, 173, 194, 37, 60, 16, 155, 86, 99, 253, 7],
420+
"lhs_pk": [
421+
91, 82, 235, 39, 167, 29, 141, 253, 163, 163, 55, 185, 162, 191, 52, 8, 245, 7, 104, 22, 182, 239, 133, 138, 131, 15, 233, 116, 147, 251, 182, 140],
422+
"rhs_pk": [189, 26, 9, 118, 59, 34, 225, 34, 104, 202, 192, 7, 66, 150, 137, 75, 106, 7, 22, 234, 42, 94, 139, 65, 241, 65, 1, 190, 153, 16, 221, 87]
423+
},
424+
"lhs_pk": [206, 50, 185, 93, 20, 234, 100, 168, 163, 125, 95, 201, 162, 104, 35, 2, 205, 41, 180, 73, 107, 140, 79, 182, 173, 17, 172, 49, 51, 85, 180, 5],
425+
"rhs_pk": [68, 40, 90, 110, 254, 68, 87, 12, 19, 21, 252, 197, 69, 255, 33, 172, 140, 70, 79, 39, 71, 217, 12, 254, 82, 125, 123, 148, 221, 217, 141, 194]
426+
},
427+
"lhs_pk": [155, 2, 30, 71, 52, 89, 112, 247, 108, 177, 144, 212, 206, 254, 87, 126, 180, 207, 146, 223, 164, 246, 178, 62, 148, 96, 39, 136, 106, 36, 253, 56],
428+
"rhs_pk": [155, 140, 124, 154, 235, 97, 51, 77, 208, 24, 45, 219, 199, 232, 222, 26, 160, 62, 38, 253, 121, 241, 219, 233, 36, 50, 60, 182, 127, 255, 132, 245]
429+
},
430+
"lhs_pk": [172, 176, 18, 228, 203, 85, 44, 151, 221, 13, 91, 250, 67, 232, 114, 16, 251, 13, 115, 233, 214, 194, 102, 199, 200, 124, 30, 190, 143, 18, 85, 75],
431+
"rhs_pk": [100, 192, 98, 123, 150, 116, 55, 42, 207, 44, 181, 31, 203, 65, 237, 13, 55, 246, 185, 211, 149, 245, 245, 219, 183, 41, 237, 253, 128, 231, 161, 226]
432+
},
433+
"lhs_pk": [112, 16, 177, 142, 158, 1, 36, 210, 87, 165, 5, 195, 199, 61, 13, 195, 219, 26, 231, 103, 163, 223, 54, 16, 106, 0, 252, 69, 242, 31, 210, 167],
434+
"rhs_pk": [15, 246, 81, 72, 172, 15, 170, 235, 10, 64, 229, 233, 169, 140, 179, 209, 244, 183, 3, 59, 2, 252, 233, 229, 13, 190, 196, 208, 109, 30, 73, 113]
435+
},
436+
"lhs_pk": [114, 238, 75, 184, 228, 147, 37, 72, 134, 65, 139, 64, 81, 114, 157, 148, 197, 108, 80, 89, 30, 235, 75, 108, 193, 53, 185, 15, 57, 61, 181, 119],
437+
"rhs_pk": [82, 28, 113, 114, 168, 192, 222, 110, 96, 15, 28, 179, 164, 180, 76, 87, 254, 72, 48, 154, 167, 102, 220, 74, 76, 136, 45, 105, 243, 87, 165, 212]
438+
}
439+
}
440+
"#;
441+
442+
let _: StmInitializerWrapper = serde_json::from_str(string)
443+
.expect("Deserializing a StmInitializerWrapper should not fail");
444+
}
399445
}

0 commit comments

Comments
 (0)