1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
use std::collections::BTreeMap;
use amplify::Wrapper;
use bp::dbc;
use commit_verify::{CommitConceal, CommitEncode, ToMerkleSource};
use super::OwnedRightsInner;
use crate::schema::NodeType;
use crate::{seal, Assignment, OwnedRights, State, TypedAssignments};
pub trait RevealSeals {
fn reveal_seals(&mut self, known_seals: &[seal::Revealed]) -> usize;
}
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Display, From, Error)]
#[display(doc_comments)]
pub enum Error {
OwnedStateMismatch,
AssignmentMismatch,
OwnedRightsMismatch,
#[from]
AnchorsMismatch(dbc::anchor::MergeError),
NodeMismatch(NodeType),
}
pub trait MergeReveal: Sized {
fn merge_reveal(self, other: Self) -> Result<Self, Error>;
}
impl<STATE> MergeReveal for Assignment<STATE>
where
Self: Clone,
STATE: State,
STATE::Confidential: PartialEq + Eq,
STATE::Confidential: From<<STATE::Revealed as CommitConceal>::ConcealedCommitment>,
{
fn merge_reveal(self, other: Self) -> Result<Self, Error> {
if self.commit_serialize() != other.commit_serialize() {
Err(Error::OwnedStateMismatch)
} else {
match (self, other) {
(_, state @ Assignment::Revealed { .. })
| (state @ Assignment::Revealed { .. }, _) => Ok(state),
(
Assignment::ConfidentialSeal { state, .. },
Assignment::ConfidentialState { seal, .. },
) => Ok(Assignment::Revealed { seal, state }),
(
Assignment::ConfidentialState { seal, .. },
Assignment::ConfidentialSeal { state, .. },
) => Ok(Assignment::Revealed { seal, state }),
(
state @ Assignment::ConfidentialState { .. },
Assignment::ConfidentialState { .. },
) => Ok(state),
(
state @ Assignment::ConfidentialSeal { .. },
Assignment::ConfidentialSeal { .. },
) => Ok(state),
(state, Assignment::Confidential { .. })
| (Assignment::Confidential { .. }, state) => Ok(state),
}
}
}
}
impl MergeReveal for TypedAssignments {
fn merge_reveal(self, other: Self) -> Result<Self, Error> {
if self.consensus_commitments() != other.consensus_commitments() {
Err(Error::AssignmentMismatch)
} else {
match (self, other) {
(TypedAssignments::Void(first_vec), TypedAssignments::Void(second_vec)) => {
let mut result = Vec::with_capacity(first_vec.len());
for (first, second) in first_vec.into_iter().zip(second_vec.into_iter()) {
result.push(first.merge_reveal(second)?);
}
Ok(TypedAssignments::Void(result))
}
(TypedAssignments::Value(first_vec), TypedAssignments::Value(second_vec)) => {
let mut result = Vec::with_capacity(first_vec.len());
for (first, second) in first_vec.into_iter().zip(second_vec.into_iter()) {
result.push(first.merge_reveal(second)?);
}
Ok(TypedAssignments::Value(result))
}
(TypedAssignments::Data(first_vec), TypedAssignments::Data(second_vec)) => {
let mut result = Vec::with_capacity(first_vec.len());
for (first, second) in first_vec.into_iter().zip(second_vec.into_iter()) {
result.push(first.merge_reveal(second)?);
}
Ok(TypedAssignments::Data(result))
}
_ => {
unreachable!("Assignments::consensus_commitments is broken")
}
}
}
}
}
impl MergeReveal for OwnedRights {
fn merge_reveal(self, other: Self) -> Result<Self, Error> {
if self.to_merkle_source().commit_serialize() != other.to_merkle_source().commit_serialize()
{
return Err(Error::OwnedRightsMismatch);
}
let mut result: OwnedRightsInner = BTreeMap::new();
for (first, second) in self
.into_inner()
.into_iter()
.zip(other.into_inner().into_iter())
{
result.insert(first.0, first.1.merge_reveal(second.1)?);
}
Ok(OwnedRights::from_inner(result))
}
}
#[cfg(test)]
mod test {
use super::*;
use crate::strict_encoding::StrictDecode;
use crate::{ConcealState, HashStrategy, PedersenStrategy};
static HASH_VARIANT: [u8; 267] = include!("../../test/hash_state.in");
static PEDERSAN_VARIANT: [u8; 1664] = include!("../../test/pedersan_state.in");
#[test]
#[ignore]
fn test_into_revealed_state() {
let ass = TypedAssignments::strict_decode(&PEDERSAN_VARIANT[..])
.unwrap()
.into_value_assignments();
let rev = ass[1].clone();
let mut merged = rev.clone().merge_reveal(rev.clone()).unwrap();
assert_eq!(merged, rev);
let conf = rev.commit_conceal();
merged = rev.clone().merge_reveal(conf.clone()).unwrap();
assert_eq!(merged, rev);
let mut conf_state = rev.clone();
conf_state.conceal_state();
merged = rev.clone().merge_reveal(conf_state.clone()).unwrap();
assert_eq!(merged, rev);
let seal = rev.to_confidential_seal();
let conf_seal = Assignment::<PedersenStrategy>::ConfidentialSeal {
seal,
state: rev.as_revealed_state().unwrap().clone(),
};
merged = rev.clone().merge_reveal(conf_seal.clone()).unwrap();
assert_eq!(merged, rev);
merged = conf_seal.clone().merge_reveal(conf_state.clone()).unwrap();
assert_eq!(merged, rev);
merged = conf_state.clone().merge_reveal(conf_seal.clone()).unwrap();
assert_eq!(merged, rev);
merged = conf.clone().merge_reveal(rev.clone()).unwrap();
assert_eq!(merged, rev);
merged = conf.clone().merge_reveal(conf_seal.clone()).unwrap();
assert_eq!(merged, conf_seal);
merged = conf.clone().merge_reveal(conf_state.clone()).unwrap();
assert_eq!(merged, conf_state);
merged = conf.clone().merge_reveal(conf.clone()).unwrap();
assert_eq!(merged, conf);
}
#[test]
#[ignore]
fn test_into_revealed_assignements_ownedstates() {
let assignment = TypedAssignments::strict_decode(&HASH_VARIANT[..])
.unwrap()
.to_data_assignments();
let rev = assignment[3].clone();
let conf = rev.clone().commit_conceal();
let seal = rev.to_confidential_seal();
let conf_seal = Assignment::<HashStrategy>::ConfidentialSeal {
seal,
state: rev.as_revealed_state().unwrap().clone(),
};
let mut conf_state = rev.clone();
conf_state.conceal_state();
let test_variant_1 = vec![rev.clone(), conf_seal, conf_state, conf.clone()];
let assignment_1 = TypedAssignments::Data(test_variant_1.clone());
let mut test_variant_2 = test_variant_1.clone();
test_variant_2.reverse();
let assignmnet_2 = TypedAssignments::Data(test_variant_2);
let merged = assignment_1
.clone()
.merge_reveal(assignmnet_2.clone())
.unwrap();
for state in merged.to_data_assignments() {
assert_eq!(state, rev);
}
let test_variant_3 = vec![conf.clone(), conf.clone(), conf.clone(), conf.clone()];
let assignment_3 = TypedAssignments::Data(test_variant_3);
let merged = assignment_3
.clone()
.merge_reveal(assignment_1.clone())
.unwrap();
assert_eq!(assignment_1, merged);
let test_owned_rights_1: OwnedRights = bmap! { 1u16 => assignment_1.clone() }.into();
let test_owned_rights_2: OwnedRights = bmap! { 1u16 => assignmnet_2.clone()}.into();
let merged = test_owned_rights_1
.clone()
.merge_reveal(test_owned_rights_2.clone())
.unwrap();
let states = vec![rev.clone(), rev.clone(), rev.clone(), rev.clone()];
let assgn = TypedAssignments::Data(states);
let expected_rights: OwnedRights = bmap! {1u16 => assgn}.into();
assert_eq!(merged, expected_rights);
}
}