Skip to content

Commit 777bfd5

Browse files
cryptonemocryptonemo
authored
fix: fix proof name for Non-interactive PoRep (#99)
The Ni-PoRep names were wrong. This commit fixes it before the wrong names become part of a release.
1 parent 0fde8f9 commit 777bfd5

File tree

2 files changed

+96
-93
lines changed

2 files changed

+96
-93
lines changed

‎src/registry.rs

Lines changed: 71 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,17 @@ pub enum RegisteredSealProof {
3434
StackedDrg32GiBV1_1_Feat_SyntheticPoRep,
3535
StackedDrg64GiBV1_1_Feat_SyntheticPoRep,
3636

37-
StackedDrg2KiBV1_1_Feat_NonInteractivePoRep,
38-
StackedDrg8MiBV1_1_Feat_NonInteractivePoRep,
39-
StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep,
40-
StackedDrg32GiBV1_1_Feat_NonInteractivePoRep,
41-
StackedDrg64GiBV1_1_Feat_NonInteractivePoRep,
37+
// NOTE: The SyntheticPoRep feature was added in proofs API
38+
// version 1.2, however the published proof name has the incorrect
39+
// version 1_1 coded into it.
40+
//
41+
// Non-interactive PoRep is also a feature added at API version
42+
// 1.2, so the naming has been corrected before publication.
43+
StackedDrg2KiBV1_2_Feat_NonInteractivePoRep,
44+
StackedDrg8MiBV1_2_Feat_NonInteractivePoRep,
45+
StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep,
46+
StackedDrg32GiBV1_2_Feat_NonInteractivePoRep,
47+
StackedDrg64GiBV1_2_Feat_NonInteractivePoRep,
4248
}
4349

4450
// This maps all registered seal proof enum types to porep_id values.
@@ -75,23 +81,23 @@ lazy_static! {
7581
14
7682
),
7783
(
78-
RegisteredSealProof::StackedDrg2KiBV1_1_Feat_NonInteractivePoRep,
84+
RegisteredSealProof::StackedDrg2KiBV1_2_Feat_NonInteractivePoRep,
7985
15
8086
),
8187
(
82-
RegisteredSealProof::StackedDrg8MiBV1_1_Feat_NonInteractivePoRep,
88+
RegisteredSealProof::StackedDrg8MiBV1_2_Feat_NonInteractivePoRep,
8389
16
8490
),
8591
(
86-
RegisteredSealProof::StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep,
92+
RegisteredSealProof::StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep,
8793
17
8894
),
8995
(
90-
RegisteredSealProof::StackedDrg32GiBV1_1_Feat_NonInteractivePoRep,
96+
RegisteredSealProof::StackedDrg32GiBV1_2_Feat_NonInteractivePoRep,
9197
18
9298
),
9399
(
94-
RegisteredSealProof::StackedDrg64GiBV1_1_Feat_NonInteractivePoRep,
100+
RegisteredSealProof::StackedDrg64GiBV1_2_Feat_NonInteractivePoRep,
95101
19
96102
),
97103
]
@@ -138,21 +144,18 @@ impl RegisteredSealProof {
138144
match self {
139145
StackedDrg2KiBV1 | StackedDrg8MiBV1 | StackedDrg512MiBV1 | StackedDrg32GiBV1
140146
| StackedDrg64GiBV1 => ApiVersion::V1_0_0,
141-
StackedDrg2KiBV1_1
142-
| StackedDrg8MiBV1_1
143-
| StackedDrg512MiBV1_1
144-
| StackedDrg32GiBV1_1
145-
| StackedDrg64GiBV1_1
146-
| StackedDrg2KiBV1_1_Feat_SyntheticPoRep
147+
StackedDrg2KiBV1_1 | StackedDrg8MiBV1_1 | StackedDrg512MiBV1_1
148+
| StackedDrg32GiBV1_1 | StackedDrg64GiBV1_1 => ApiVersion::V1_1_0,
149+
StackedDrg2KiBV1_1_Feat_SyntheticPoRep
147150
| StackedDrg8MiBV1_1_Feat_SyntheticPoRep
148151
| StackedDrg512MiBV1_1_Feat_SyntheticPoRep
149152
| StackedDrg32GiBV1_1_Feat_SyntheticPoRep
150153
| StackedDrg64GiBV1_1_Feat_SyntheticPoRep
151-
| StackedDrg2KiBV1_1_Feat_NonInteractivePoRep
152-
| StackedDrg8MiBV1_1_Feat_NonInteractivePoRep
153-
| StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep
154-
| StackedDrg32GiBV1_1_Feat_NonInteractivePoRep
155-
| StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => ApiVersion::V1_1_0,
154+
| StackedDrg2KiBV1_2_Feat_NonInteractivePoRep
155+
| StackedDrg8MiBV1_2_Feat_NonInteractivePoRep
156+
| StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep
157+
| StackedDrg32GiBV1_2_Feat_NonInteractivePoRep
158+
| StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => ApiVersion::V1_2_0,
156159
}
157160
}
158161

@@ -178,23 +181,23 @@ impl RegisteredSealProof {
178181
StackedDrg2KiBV1
179182
| StackedDrg2KiBV1_1
180183
| StackedDrg2KiBV1_1_Feat_SyntheticPoRep
181-
| StackedDrg2KiBV1_1_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_2_KIB,
184+
| StackedDrg2KiBV1_2_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_2_KIB,
182185
StackedDrg8MiBV1
183186
| StackedDrg8MiBV1_1
184187
| StackedDrg8MiBV1_1_Feat_SyntheticPoRep
185-
| StackedDrg8MiBV1_1_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_8_MIB,
188+
| StackedDrg8MiBV1_2_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_8_MIB,
186189
StackedDrg512MiBV1
187190
| StackedDrg512MiBV1_1
188191
| StackedDrg512MiBV1_1_Feat_SyntheticPoRep
189-
| StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep => constants::SECTOR_SIZE_512_MIB,
192+
| StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep => constants::SECTOR_SIZE_512_MIB,
190193
StackedDrg32GiBV1
191194
| StackedDrg32GiBV1_1
192195
| StackedDrg32GiBV1_1_Feat_SyntheticPoRep
193-
| StackedDrg32GiBV1_1_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_32_GIB,
196+
| StackedDrg32GiBV1_2_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_32_GIB,
194197
StackedDrg64GiBV1
195198
| StackedDrg64GiBV1_1
196199
| StackedDrg64GiBV1_1_Feat_SyntheticPoRep
197-
| StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_64_GIB,
200+
| StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => constants::SECTOR_SIZE_64_GIB,
198201
};
199202
SectorSize(size)
200203
}
@@ -238,11 +241,11 @@ impl RegisteredSealProof {
238241
.get(&constants::SECTOR_SIZE_64_GIB)
239242
.expect("invalid sector size")
240243
}
241-
StackedDrg2KiBV1_1_Feat_NonInteractivePoRep
242-
| StackedDrg8MiBV1_1_Feat_NonInteractivePoRep
243-
| StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep
244-
| StackedDrg32GiBV1_1_Feat_NonInteractivePoRep
245-
| StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => {
244+
StackedDrg2KiBV1_2_Feat_NonInteractivePoRep
245+
| StackedDrg8MiBV1_2_Feat_NonInteractivePoRep
246+
| StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep
247+
| StackedDrg32GiBV1_2_Feat_NonInteractivePoRep
248+
| StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => {
246249
constants::get_porep_non_interactive_partitions(self.sector_size().into())
247250
}
248251
}
@@ -268,11 +271,11 @@ impl RegisteredSealProof {
268271
| StackedDrg512MiBV1_1_Feat_SyntheticPoRep
269272
| StackedDrg32GiBV1_1_Feat_SyntheticPoRep
270273
| StackedDrg64GiBV1_1_Feat_SyntheticPoRep
271-
| StackedDrg2KiBV1_1_Feat_NonInteractivePoRep
272-
| StackedDrg8MiBV1_1_Feat_NonInteractivePoRep
273-
| StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep
274-
| StackedDrg32GiBV1_1_Feat_NonInteractivePoRep
275-
| StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => {
274+
| StackedDrg2KiBV1_2_Feat_NonInteractivePoRep
275+
| StackedDrg8MiBV1_2_Feat_NonInteractivePoRep
276+
| StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep
277+
| StackedDrg32GiBV1_2_Feat_NonInteractivePoRep
278+
| StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => {
276279
filecoin_proofs_v1::SINGLE_PARTITION_PROOF_LEN
277280
}
278281
}
@@ -329,7 +332,7 @@ impl RegisteredSealProof {
329332
| StackedDrg512MiBV1_1_Feat_SyntheticPoRep
330333
| StackedDrg32GiBV1_1_Feat_SyntheticPoRep
331334
| StackedDrg64GiBV1_1_Feat_SyntheticPoRep => {
332-
assert_eq!(self.version(), ApiVersion::V1_1_0);
335+
assert_eq!(self.version(), ApiVersion::V1_2_0);
333336
PoRepConfig {
334337
sector_size: self.sector_size(),
335338
partitions: PoRepProofPartitions(self.partitions()),
@@ -338,12 +341,12 @@ impl RegisteredSealProof {
338341
api_features: vec![ApiFeature::SyntheticPoRep],
339342
}
340343
}
341-
StackedDrg2KiBV1_1_Feat_NonInteractivePoRep
342-
| StackedDrg8MiBV1_1_Feat_NonInteractivePoRep
343-
| StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep
344-
| StackedDrg32GiBV1_1_Feat_NonInteractivePoRep
345-
| StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => {
346-
assert_eq!(self.version(), ApiVersion::V1_1_0);
344+
StackedDrg2KiBV1_2_Feat_NonInteractivePoRep
345+
| StackedDrg8MiBV1_2_Feat_NonInteractivePoRep
346+
| StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep
347+
| StackedDrg32GiBV1_2_Feat_NonInteractivePoRep
348+
| StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => {
349+
assert_eq!(self.version(), ApiVersion::V1_2_0);
347350
PoRepConfig {
348351
sector_size: self.sector_size(),
349352
partitions: PoRepProofPartitions(self.partitions()),
@@ -435,23 +438,23 @@ impl RegisteredSealProof {
435438
StackedDrg2KiBV1
436439
| StackedDrg2KiBV1_1
437440
| StackedDrg2KiBV1_1_Feat_SyntheticPoRep
438-
| StackedDrg2KiBV1_1_Feat_NonInteractivePoRep => StackedDrgWinning2KiBV1,
441+
| StackedDrg2KiBV1_2_Feat_NonInteractivePoRep => StackedDrgWinning2KiBV1,
439442
StackedDrg8MiBV1
440443
| StackedDrg8MiBV1_1
441444
| StackedDrg8MiBV1_1_Feat_SyntheticPoRep
442-
| StackedDrg8MiBV1_1_Feat_NonInteractivePoRep => StackedDrgWinning8MiBV1,
445+
| StackedDrg8MiBV1_2_Feat_NonInteractivePoRep => StackedDrgWinning8MiBV1,
443446
StackedDrg512MiBV1
444447
| StackedDrg512MiBV1_1
445448
| StackedDrg512MiBV1_1_Feat_SyntheticPoRep
446-
| StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep => StackedDrgWinning512MiBV1,
449+
| StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep => StackedDrgWinning512MiBV1,
447450
StackedDrg32GiBV1
448451
| StackedDrg32GiBV1_1
449452
| StackedDrg32GiBV1_1_Feat_SyntheticPoRep
450-
| StackedDrg32GiBV1_1_Feat_NonInteractivePoRep => StackedDrgWinning32GiBV1,
453+
| StackedDrg32GiBV1_2_Feat_NonInteractivePoRep => StackedDrgWinning32GiBV1,
451454
StackedDrg64GiBV1
452455
| StackedDrg64GiBV1_1
453456
| StackedDrg64GiBV1_1_Feat_SyntheticPoRep
454-
| StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => StackedDrgWinning64GiBV1,
457+
| StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => StackedDrgWinning64GiBV1,
455458
}
456459
}
457460

@@ -470,23 +473,23 @@ impl RegisteredSealProof {
470473
StackedDrg2KiBV1
471474
| StackedDrg2KiBV1_1
472475
| StackedDrg2KiBV1_1_Feat_SyntheticPoRep
473-
| StackedDrg2KiBV1_1_Feat_NonInteractivePoRep => StackedDrgWindow2KiBV1_2,
476+
| StackedDrg2KiBV1_2_Feat_NonInteractivePoRep => StackedDrgWindow2KiBV1_2,
474477
StackedDrg8MiBV1
475478
| StackedDrg8MiBV1_1
476479
| StackedDrg8MiBV1_1_Feat_SyntheticPoRep
477-
| StackedDrg8MiBV1_1_Feat_NonInteractivePoRep => StackedDrgWindow8MiBV1_2,
480+
| StackedDrg8MiBV1_2_Feat_NonInteractivePoRep => StackedDrgWindow8MiBV1_2,
478481
StackedDrg512MiBV1
479482
| StackedDrg512MiBV1_1
480483
| StackedDrg512MiBV1_1_Feat_SyntheticPoRep
481-
| StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep => StackedDrgWindow512MiBV1_2,
484+
| StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep => StackedDrgWindow512MiBV1_2,
482485
StackedDrg32GiBV1
483486
| StackedDrg32GiBV1_1
484487
| StackedDrg32GiBV1_1_Feat_SyntheticPoRep
485-
| StackedDrg32GiBV1_1_Feat_NonInteractivePoRep => StackedDrgWindow32GiBV1_2,
488+
| StackedDrg32GiBV1_2_Feat_NonInteractivePoRep => StackedDrgWindow32GiBV1_2,
486489
StackedDrg64GiBV1
487490
| StackedDrg64GiBV1_1
488491
| StackedDrg64GiBV1_1_Feat_SyntheticPoRep
489-
| StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => StackedDrgWindow64GiBV1_2,
492+
| StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => StackedDrgWindow64GiBV1_2,
490493
}
491494
}
492495
}
@@ -964,11 +967,11 @@ mod tests {
964967
RegisteredSealProof::StackedDrg512MiBV1_1_Feat_SyntheticPoRep,
965968
RegisteredSealProof::StackedDrg32GiBV1_1_Feat_SyntheticPoRep,
966969
RegisteredSealProof::StackedDrg64GiBV1_1_Feat_SyntheticPoRep,
967-
RegisteredSealProof::StackedDrg2KiBV1_1_Feat_NonInteractivePoRep,
968-
RegisteredSealProof::StackedDrg8MiBV1_1_Feat_NonInteractivePoRep,
969-
RegisteredSealProof::StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep,
970-
RegisteredSealProof::StackedDrg32GiBV1_1_Feat_NonInteractivePoRep,
971-
RegisteredSealProof::StackedDrg64GiBV1_1_Feat_NonInteractivePoRep,
970+
RegisteredSealProof::StackedDrg2KiBV1_2_Feat_NonInteractivePoRep,
971+
RegisteredSealProof::StackedDrg8MiBV1_2_Feat_NonInteractivePoRep,
972+
RegisteredSealProof::StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep,
973+
RegisteredSealProof::StackedDrg32GiBV1_2_Feat_NonInteractivePoRep,
974+
RegisteredSealProof::StackedDrg64GiBV1_2_Feat_NonInteractivePoRep,
972975
];
973976

974977
#[test]
@@ -1025,19 +1028,19 @@ mod tests {
10251028
RegisteredSealProof::StackedDrg64GiBV1_1_Feat_SyntheticPoRep => {
10261029
"0e00000000000000000000000000000000000000000000000000000000000000"
10271030
}
1028-
RegisteredSealProof::StackedDrg2KiBV1_1_Feat_NonInteractivePoRep => {
1031+
RegisteredSealProof::StackedDrg2KiBV1_2_Feat_NonInteractivePoRep => {
10291032
"0f00000000000000000000000000000000000000000000000000000000000000"
10301033
}
1031-
RegisteredSealProof::StackedDrg8MiBV1_1_Feat_NonInteractivePoRep => {
1034+
RegisteredSealProof::StackedDrg8MiBV1_2_Feat_NonInteractivePoRep => {
10321035
"1000000000000000000000000000000000000000000000000000000000000000"
10331036
}
1034-
RegisteredSealProof::StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep => {
1037+
RegisteredSealProof::StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep => {
10351038
"1100000000000000000000000000000000000000000000000000000000000000"
10361039
}
1037-
RegisteredSealProof::StackedDrg32GiBV1_1_Feat_NonInteractivePoRep => {
1040+
RegisteredSealProof::StackedDrg32GiBV1_2_Feat_NonInteractivePoRep => {
10381041
"1200000000000000000000000000000000000000000000000000000000000000"
10391042
}
1040-
RegisteredSealProof::StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => {
1043+
RegisteredSealProof::StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => {
10411044
"1300000000000000000000000000000000000000000000000000000000000000"
10421045
}
10431046
};
@@ -1078,11 +1081,11 @@ mod tests {
10781081
| RegisteredSealProof::StackedDrg512MiBV1_1_Feat_SyntheticPoRep
10791082
| RegisteredSealProof::StackedDrg32GiBV1_1_Feat_SyntheticPoRep
10801083
| RegisteredSealProof::StackedDrg64GiBV1_1_Feat_SyntheticPoRep
1081-
| RegisteredSealProof::StackedDrg2KiBV1_1_Feat_NonInteractivePoRep
1082-
| RegisteredSealProof::StackedDrg8MiBV1_1_Feat_NonInteractivePoRep
1083-
| RegisteredSealProof::StackedDrg512MiBV1_1_Feat_NonInteractivecPoRep
1084-
| RegisteredSealProof::StackedDrg32GiBV1_1_Feat_NonInteractivePoRep
1085-
| RegisteredSealProof::StackedDrg64GiBV1_1_Feat_NonInteractivePoRep => {
1084+
| RegisteredSealProof::StackedDrg2KiBV1_2_Feat_NonInteractivePoRep
1085+
| RegisteredSealProof::StackedDrg8MiBV1_2_Feat_NonInteractivePoRep
1086+
| RegisteredSealProof::StackedDrg512MiBV1_2_Feat_NonInteractivecPoRep
1087+
| RegisteredSealProof::StackedDrg32GiBV1_2_Feat_NonInteractivePoRep
1088+
| RegisteredSealProof::StackedDrg64GiBV1_2_Feat_NonInteractivePoRep => {
10861089
assert!(!is_legacy)
10871090
}
10881091
}

0 commit comments

Comments
 (0)