Skip to content

Commit 6c0c495

Browse files
dhusebydhuseby
committed
fix codec update
Signed-off-by: Dave Huseby <[email protected]>
1 parent 8964981 commit 6c0c495

File tree

2 files changed

+38
-77
lines changed

2 files changed

+38
-77
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "multisig"
3-
version = "1.0.3"
3+
version = "1.0.4"
44
edition = "2021"
55
authors = ["Dave Grantham <[email protected]>"]
66
description = "Multisig self-describing multicodec implementation for digital signatures"

‎src/serde/mod.rs‎

Lines changed: 37 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,7 @@ mod tests {
2121
assert_tokens(
2222
&ms.compact(),
2323
&[
24-
Token::BorrowedBytes(&[
25-
0x39,
26-
0xed, 0xa1, 0x03,
27-
0x00,
28-
0x01,
29-
0x00, 0x40,
30-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
31-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
32-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
33-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
34-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
35-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
36-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
37-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
24+
Token::BorrowedBytes(&[185, 36, 237, 161, 3, 0, 1, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
3825
],
3926
)
4027
}
@@ -49,7 +36,7 @@ mod tests {
4936

5037
assert_tokens(
5138
&ms.readable(),
52-
&[Token::BorrowedStr("zrbLpQxbC4NFd4eLTzwpanG2E3Xgk6D1z6mv5tfW9hqZQ9Lx2WSJCkKdTVHsek5riPYZfZ1mNFztn4gyeUG9svAH9Yykx3fuUdD")
39+
&[Token::BorrowedStr("zD4bHwUem3jQTfFd82d2koBo7sa2cAr9mvAJcXEVSAPe8mjDHRaGRYYjFmphxaAsUhENDevuR7J3xtWpW41pqEKrpMQfkZEwFopdm")
5340
],
5441
)
5542
}
@@ -116,21 +103,7 @@ mod tests {
116103
assert_tokens(
117104
&ms.compact(),
118105
&[
119-
Token::BorrowedBytes(&[
120-
0x39,
121-
0xe7, 0xa1, 0x03,
122-
0x00,
123-
0x01,
124-
0x00, 0x40,
125-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
126-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
127-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
128-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
129-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
130-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
131-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
132-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
133-
])
106+
Token::BorrowedBytes(&[185, 36, 231, 161, 3, 0, 1, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
134107
],
135108
)
136109
}
@@ -145,7 +118,7 @@ mod tests {
145118

146119
assert_tokens(
147120
&ms.readable(),
148-
&[Token::BorrowedStr("zraBKYTRFNqbSHenWPTkduwKtHG3ANrnuwtDk4yPop3Fw8QDybGFRmqCAJ92d3bfkZ9Ajme2ZLmXdt4FaBZWrYf9AajzTauFb67")
121+
&[Token::BorrowedStr("zD4bGmynFsniw14r8UfRGjEvoBEGLXGSRh69iptfk43kLUGCLhXMFVmkmLXWoj9AzWGXpG183NV8jXNdsKwY8bJVKDRhWnkUV9w6f")
149122
],
150123
)
151124
}
@@ -204,52 +177,48 @@ mod tests {
204177

205178
#[test]
206179
fn test_bls12381g1_serde_compact() {
180+
/*
181+
let ms = Builder::new(Codec::Bls12381G1Msig)
182+
.with_signature_bytes(&[0u8; 64])
183+
.with_base_encoding(Base::Base58Btc)
184+
.try_build_encoded()
185+
.unwrap();
186+
println!("encoded bls multisig: {}", ms);
187+
*/
188+
207189
let ms = EncodedMultisig::try_from(
208-
"z2ZyJ5U2f25c7GbkLwKGPWLWdkLpsiqVMwXzFSbCnUHGJS3manQMh1jerwMHTzYq3UPj9GEid5MDEx",
190+
"zvEpmKysTLofqideRPss5Rxttsnxkkom2xvwxZ3diG5NCWR3NZpE2qxvjyTBVAyo86smZ1sk3k6wvibxJhyU8LrsLR2x16cukcjSLF",
209191
)
210192
.unwrap()
211193
.to_inner();
212194

213195
assert_tokens(
214196
&ms.compact(),
215197
&[
216-
Token::BorrowedBytes(&[
217-
0x39, // multisig sigil
218-
0xea, 0xa1, 0x03, // signature codec
219-
0x00, // message length
220-
0x01, // number of attributes
221-
// SigData (48 in length)
222-
0x00, 0x30,
223-
0x83, 0x50, 0x4f, 0x80, 0x42, 0x35, 0x6a, 0x86,
224-
0x0b, 0x6d, 0xb8, 0xc7, 0xdd, 0xcb, 0x7a, 0xcc,
225-
0x56, 0x3b, 0x53, 0xc6, 0x2c, 0xe4, 0xf9, 0x79,
226-
0xae, 0x77, 0xa9, 0xb6, 0x7d, 0x72, 0x75, 0xcc,
227-
0x3e, 0x01, 0xf8, 0xdb, 0x01, 0xd5, 0xfd, 0xbb,
228-
0x56, 0x3d, 0x07, 0xb0, 0xec, 0x2d, 0x3a, 0x79
229-
])
198+
Token::BorrowedBytes(&[185, 36, 129, 166, 192, 6, 0, 1, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
230199
],
231200
)
232201
}
233202

234203
#[test]
235204
fn test_bls12381g1_serde_encoded_string() {
236205
let ms = EncodedMultisig::try_from(
237-
"z2ZyJ5U2f25c7GbkLwKGPWLWdkLpsiqVMwXzFSbCnUHGJS3manQMh1jerwMHTzYq3UPj9GEid5MDEx",
206+
"zvEpmKysTLofqideRPss5Rxttsnxkkom2xvwxZ3diG5NCWR3NZpE2qxvjyTBVAyo86smZ1sk3k6wvibxJhyU8LrsLR2x16cukcjSLF",
238207
)
239208
.unwrap();
240209

241210
assert_tokens(
242211
&ms.readable(),
243212
&[Token::BorrowedStr(
244-
"z2ZyJ5U2f25c7GbkLwKGPWLWdkLpsiqVMwXzFSbCnUHGJS3manQMh1jerwMHTzYq3UPj9GEid5MDEx",
213+
"zvEpmKysTLofqideRPss5Rxttsnxkkom2xvwxZ3diG5NCWR3NZpE2qxvjyTBVAyo86smZ1sk3k6wvibxJhyU8LrsLR2x16cukcjSLF",
245214
)],
246215
)
247216
}
248217

249218
#[test]
250219
fn test_bls12381g1_serde_readable() {
251220
let ms = EncodedMultisig::try_from(
252-
"z2ZyJ5U2f25c7GbkLwKGPWLWdkLpsiqVMwXzFSbCnUHGJS3manQMh1jerwMHTzYq3UPj9GEid5MDEx",
221+
"zvEpmKysTLofqideRPss5Rxttsnxkkom2xvwxZ3diG5NCWR3NZpE2qxvjyTBVAyo86smZ1sk3k6wvibxJhyU8LrsLR2x16cukcjSLF",
253222
)
254223
.unwrap()
255224
.to_inner();
@@ -262,14 +231,14 @@ mod tests {
262231
len: 3,
263232
},
264233
Token::BorrowedStr("codec"),
265-
Token::BorrowedStr("bls12_381-g1-sig"),
234+
Token::BorrowedStr("bls12_381-g1-msig"),
266235
Token::BorrowedStr("message"),
267236
Token::BorrowedStr("f00"),
268237
Token::BorrowedStr("attributes"),
269238
Token::Seq { len: Some(1) },
270239
Token::Tuple { len: 2 },
271240
Token::BorrowedStr("sig-data"),
272-
Token::BorrowedStr("f3083504f8042356a860b6db8c7ddcb7acc563b53c62ce4f979ae77a9b67d7275cc3e01f8db01d5fdbb563d07b0ec2d3a79"),
241+
Token::BorrowedStr("f4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
273242
Token::TupleEnd,
274243
Token::SeqEnd,
275244
Token::StructEnd,
@@ -301,8 +270,15 @@ mod tests {
301270

302271
#[test]
303272
fn test_bls12381g1_share_serde_compact() {
273+
let ms = Builder::new(Codec::Bls12381G1Msig)
274+
.with_signature_bytes(&[0u8; 64])
275+
.with_base_encoding(Base::Base58Btc)
276+
.try_build_encoded()
277+
.unwrap();
278+
println!("encoded bls multisig: {}", ms);
279+
304280
let ms = EncodedMultisig::try_from(
305-
"h8gnkpoygyynoycfzos58ogws4pjh3a449i49jfhjcngftxqbgwh4yu8eakd66de6ykwtn7o7ptcojraoe7xgc5xub7iyryenycyogbybyononye",
281+
"hzr1ejjsyyayykybounzzo85hy3tfkhe19ro6k973bknezbqysqm4u9oax7yfx5t6wnuyz6rnfym7zttnrfajamxdoy91hyobyebonyaryrnykyeb",
306282
)
307283
.unwrap()
308284
.to_inner();
@@ -321,40 +297,30 @@ mod tests {
321297
assert_tokens(
322298
&ms.compact(),
323299
&[
324-
Token::BorrowedBytes(&[
325-
0x39, 0x84, 0xa6, 0xc0, 0x06, 0x00, 0x05, 0x00,
326-
0x30, 0xb7, 0x85, 0xb6, 0x78, 0x1a, 0x96, 0xd3,
327-
0x53, 0xcc, 0xe3, 0x5a, 0xfd, 0x75, 0xf4, 0x97,
328-
0x89, 0x60, 0x8c, 0x58, 0xbd, 0xc1, 0x35, 0x39,
329-
0xa0, 0x4c, 0xe8, 0xc2, 0x87, 0xef, 0x0d, 0x1e,
330-
0x02, 0xa9, 0x11, 0x76, 0x1d, 0x6c, 0x59, 0x04,
331-
0x93, 0x10, 0x47, 0x5e, 0x66, 0x6d, 0xf3, 0x0f,
332-
0x6a, 0x02, 0x01, 0x02, 0x03, 0x01, 0x03, 0x04,
333-
0x01, 0x04, 0x05, 0x01, 0x01,
334-
])
300+
Token::BorrowedBytes(&[185, 36, 132, 166, 192, 6, 0, 5, 0, 48, 152, 175, 120, 31, 124, 6, 98, 85, 113, 18, 249, 33, 229, 127, 185, 10, 132, 139, 133, 192, 179, 151, 169, 254, 24, 127, 64, 87, 238, 62, 160, 166, 11, 248, 130, 40, 23, 219, 198, 34, 33, 112, 156, 45, 227, 128, 63, 46, 2, 1, 2, 3, 1, 3, 4, 1, 4, 5, 1, 1])
335301
],
336302
)
337303
}
338304

339305
#[test]
340306
fn test_bls12381g1_share_serde_encoded_string() {
341307
let ms = EncodedMultisig::try_from(
342-
"h8gnkpoygyynoycfzos58ogws4pjh3a449i49jfhjcngftxqbgwh4yu8eakd66de6ykwtn7o7ptcojraoe7xgc5xub7iyryenycyogbybyononye",
308+
"hzr1ejjsyyayykybounzzo85hy3tfkhe19ro6k973bknezbqysqm4u9oax7yfx5t6wnuyz6rnfym7zttnrfajamxdoy91hyobyebonyaryrnykyeb",
343309
)
344310
.unwrap();
345311

346312
assert_tokens(
347313
&ms.readable(),
348314
&[
349-
Token::BorrowedStr("h8gnkpoygyynoycfzos58ogws4pjh3a449i49jfhjcngftxqbgwh4yu8eakd66de6ykwtn7o7ptcojraoe7xgc5xub7iyryenycyogbybyononye")
315+
Token::BorrowedStr("hzr1ejjsyyayykybounzzo85hy3tfkhe19ro6k973bknezbqysqm4u9oax7yfx5t6wnuyz6rnfym7zttnrfajamxdoy91hyobyebonyaryrnykyeb")
350316
],
351317
)
352318
}
353319

354320
#[test]
355321
fn test_bls12381g1_share_serde_readable() {
356322
let ms = EncodedMultisig::try_from(
357-
"h8gnkpoygyynoycfzos58ogws4pjh3a449i49jfhjcngftxqbgwh4yu8eakd66de6ykwtn7o7ptcojraoe7xgc5xub7iyryenycyogbybyononye",
323+
"hzr1ejjsyyayykybounzzo85hy3tfkhe19ro6k973bknezbqysqm4u9oax7yfx5t6wnuyz6rnfym7zttnrfajamxdoy91hyobyebonyaryrnykyeb",
358324
)
359325
.unwrap()
360326
.to_inner();
@@ -371,7 +337,7 @@ mod tests {
371337
Token::Seq { len: Some(5) },
372338
Token::Tuple { len: 2 },
373339
Token::BorrowedStr("sig-data"),
374-
Token::BorrowedStr("f30b785b6781a96d353cce35afd75f49789608c58bdc13539a04ce8c287ef0d1e02a911761d6c59049310475e666df30f6a"),
340+
Token::BorrowedStr("f3098af781f7c0662557112f921e57fb90a848b85c0b397a9fe187f4057ee3ea0a60bf8822817dbc62221709c2de3803f2e"),
375341
Token::TupleEnd,
376342
Token::Tuple { len: 2 },
377343
Token::BorrowedStr("scheme"),
@@ -398,7 +364,7 @@ mod tests {
398364
#[test]
399365
fn test_bls12381g1_share_serde_json() {
400366
let ms1 = EncodedMultisig::try_from(
401-
"h8gnkpoygyynoycfzos58ogws4pjh3a449i49jfhjcngftxqbgwh4yu8eakd66de6ykwtn7o7ptcojraoe7xgc5xub7iyryenycyogbybyononye",
367+
"hzr1ejjsyyayykybounzzo85hy3tfkhe19ro6k973bknezbqysqm4u9oax7yfx5t6wnuyz6rnfym7zttnrfajamxdoy91hyobyebonyaryrnykyeb",
402368
)
403369
.unwrap()
404370
.to_inner();
@@ -411,7 +377,7 @@ mod tests {
411377
#[test]
412378
fn test_bls12381g1_share_serde_cbor() {
413379
let ms1 = EncodedMultisig::try_from(
414-
"h8gnkpoygyynoycfzos58ogws4pjh3a449i49jfhjcngftxqbgwh4yu8eakd66de6ykwtn7o7ptcojraoe7xgc5xub7iyryenycyogbybyononye",
380+
"hzr1ejjsyyayykybounzzo85hy3tfkhe19ro6k973bknezbqysqm4u9oax7yfx5t6wnuyz6rnfym7zttnrfajamxdoy91hyobyebonyaryrnykyeb",
415381
)
416382
.unwrap()
417383
.to_inner();
@@ -427,12 +393,7 @@ mod tests {
427393
assert_tokens(
428394
&ms.compact(),
429395
&[
430-
Token::BorrowedBytes(&[
431-
0x39, // Multisig
432-
0x00, // Codec::Identity
433-
0x00, // message (0 length)
434-
0x00 // number of attributes
435-
])
396+
Token::BorrowedBytes(&[185, 36, 0, 0, 0])
436397
],
437398
);
438399
}
@@ -462,7 +423,7 @@ mod tests {
462423
assert_tokens(
463424
&ms.readable(),
464425
&[
465-
Token::BorrowedStr("f39000000"),
426+
Token::BorrowedStr("fb924000000"),
466427
],
467428
);
468429
}

0 commit comments

Comments
 (0)