Skip to content
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

Jump to bottom

Non Interactive Proof of Replication #1999

Closed
wants to merge 6 commits into from
Closed

Non Interactive Proof of Replication #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29f4eff
Add niporep proof type
NemanjaLu92 Apr 10, 2024
a9a02ce
Added niporep stuff so builtin actos tests work
NemanjaLu92 Apr 12, 2024
59fc122
remove niverify
NemanjaLu92 Apr 23, 2024
a5ab592
Bump filecoin-proofs-api to v18
NemanjaLu92 May 22, 2024
c6f5f20
cargo.lock
NemanjaLu92 May 22, 2024
4ad1c3f
Fix typo
NemanjaLu92 Jun 2, 2024
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
40 changes: 19 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ minstant = { workspace = true }
ambassador = { workspace = true }
derive_more = "0.99.17"
replace_with = "0.1.7"
filecoin-proofs-api = { version = "16", default-features = false }
filecoin-proofs-api = { version = "18.1", default-features = false }
rayon = "1"
fvm-wasm-instrument = "0.4.0"
yastl = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion shared/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ bitflags = { version = "2.3.3", features = ["serde"] }
## non-wasm dependencies; these dependencies and the respective code is
## only activated through non-default features, which the Kernel enables, but
## not the actors.
filecoin-proofs-api = { version = "16", default-features = false, optional = true }
filecoin-proofs-api = { version = "18.1", default-features = false, optional = true }
libsecp256k1 = { workspace = true, optional = true }
bls-signatures = { workspace = true, default-features = false, optional = true }

Expand Down
124 changes: 90 additions & 34 deletions shared/src/sector/registered_proof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ pub enum RegisteredSealProof {
StackedDRG8MiBV1P1_Feat_SyntheticPoRep,
StackedDRG32GiBV1P1_Feat_SyntheticPoRep,
StackedDRG64GiBV1P1_Feat_SyntheticPoRep,

StackedDRG2KiBV1P1_Feat_NiPoRep,
StackedDRG512MiBV1P1_Feat_NiPoRep,
StackedDRG8MiBV1P1_Feat_NiPoRep,
StackedDRG32GiBV1P1_Feat_NiPoRep,
StackedDRG64GiBV1P1_Feat_NiPoRep,
// TODO: get rid of this option once we no longer need go compat.
// We use it to ensure that we can deserialize bad values here because go checks this value
// later.
Expand Down Expand Up @@ -92,14 +98,19 @@ impl RegisteredSealProof {
| StackedDRG8MiBV1P1
| StackedDRG2KiBV1P1_Feat_SyntheticPoRep
| StackedDRG512MiBV1P1_Feat_SyntheticPoRep
| StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(192),
| StackedDRG8MiBV1P1_Feat_SyntheticPoRep
| StackedDRG2KiBV1P1_Feat_NiPoRep
| StackedDRG512MiBV1P1_Feat_NiPoRep
| StackedDRG8MiBV1P1_Feat_NiPoRep => Ok(192),

StackedDRG32GiBV1
| StackedDRG64GiBV1
| StackedDRG32GiBV1P1
| StackedDRG64GiBV1P1
| StackedDRG32GiBV1P1_Feat_SyntheticPoRep
| StackedDRG64GiBV1P1_Feat_SyntheticPoRep => Ok(1920),
| StackedDRG64GiBV1P1_Feat_SyntheticPoRep
| StackedDRG32GiBV1P1_Feat_NiPoRep
| StackedDRG64GiBV1P1_Feat_NiPoRep => Ok(1920),
Invalid(i) => Err(format!("unsupported proof type: {}", i)),
}
}
Expand Down Expand Up @@ -180,21 +191,26 @@ impl RegisteredSealProof {
pub fn sector_size(self) -> Result<SectorSize, String> {
use RegisteredSealProof::*;
match self {
StackedDRG2KiBV1 | StackedDRG2KiBV1P1 | StackedDRG2KiBV1P1_Feat_SyntheticPoRep => {
Ok(SectorSize::_2KiB)
}
StackedDRG8MiBV1 | StackedDRG8MiBV1P1 | StackedDRG8MiBV1P1_Feat_SyntheticPoRep => {
Ok(SectorSize::_8MiB)
}
StackedDRG2KiBV1
| StackedDRG2KiBV1P1
| StackedDRG2KiBV1P1_Feat_SyntheticPoRep
| StackedDRG2KiBV1P1_Feat_NiPoRep => Ok(SectorSize::_2KiB),
StackedDRG8MiBV1
| StackedDRG8MiBV1P1
| StackedDRG8MiBV1P1_Feat_SyntheticPoRep
| StackedDRG8MiBV1P1_Feat_NiPoRep => Ok(SectorSize::_8MiB),
StackedDRG512MiBV1
| StackedDRG512MiBV1P1
| StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(SectorSize::_512MiB),
StackedDRG32GiBV1 | StackedDRG32GiBV1P1 | StackedDRG32GiBV1P1_Feat_SyntheticPoRep => {
Ok(SectorSize::_32GiB)
}
StackedDRG64GiBV1 | StackedDRG64GiBV1P1 | StackedDRG64GiBV1P1_Feat_SyntheticPoRep => {
Ok(SectorSize::_64GiB)
}
| StackedDRG512MiBV1P1_Feat_SyntheticPoRep
| StackedDRG512MiBV1P1_Feat_NiPoRep => Ok(SectorSize::_512MiB),
StackedDRG32GiBV1
| StackedDRG32GiBV1P1
| StackedDRG32GiBV1P1_Feat_SyntheticPoRep
| StackedDRG32GiBV1P1_Feat_NiPoRep => Ok(SectorSize::_32GiB),
StackedDRG64GiBV1
| StackedDRG64GiBV1P1
| StackedDRG64GiBV1P1_Feat_SyntheticPoRep
| StackedDRG64GiBV1P1_Feat_NiPoRep => Ok(SectorSize::_64GiB),
Invalid(i) => Err(format!("unsupported proof type: {}", i)),
}
}
Expand All @@ -205,17 +221,26 @@ impl RegisteredSealProof {
// Resolve to seal proof and then compute size from that.
use RegisteredSealProof::*;
match self {
StackedDRG64GiBV1 | StackedDRG64GiBV1P1 | StackedDRG64GiBV1P1_Feat_SyntheticPoRep => {
Ok(2300)
}
StackedDRG32GiBV1 | StackedDRG32GiBV1P1 | StackedDRG32GiBV1P1_Feat_SyntheticPoRep => {
Ok(2349)
}
StackedDRG2KiBV1 | StackedDRG2KiBV1P1 | StackedDRG2KiBV1P1_Feat_SyntheticPoRep => Ok(2),
StackedDRG8MiBV1 | StackedDRG8MiBV1P1 | StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(2),
StackedDRG64GiBV1
| StackedDRG64GiBV1P1
| StackedDRG64GiBV1P1_Feat_SyntheticPoRep
| StackedDRG64GiBV1P1_Feat_NiPoRep => Ok(2300),
StackedDRG32GiBV1
| StackedDRG32GiBV1P1
| StackedDRG32GiBV1P1_Feat_SyntheticPoRep
| StackedDRG32GiBV1P1_Feat_NiPoRep => Ok(2349),
StackedDRG2KiBV1
| StackedDRG2KiBV1P1
| StackedDRG2KiBV1P1_Feat_SyntheticPoRep
| StackedDRG2KiBV1P1_Feat_NiPoRep => Ok(2),
StackedDRG8MiBV1
| StackedDRG8MiBV1P1
| StackedDRG8MiBV1P1_Feat_SyntheticPoRep
| StackedDRG8MiBV1P1_Feat_NiPoRep => Ok(2),
StackedDRG512MiBV1
| StackedDRG512MiBV1P1
| StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(2),
| StackedDRG512MiBV1P1_Feat_SyntheticPoRep
| StackedDRG512MiBV1P1_Feat_NiPoRep => Ok(2),
Invalid(i) => Err(format!("unsupported proof type: {}", i)),
}
}
Expand All @@ -227,19 +252,24 @@ impl RegisteredSealProof {
match self {
Self::StackedDRG64GiBV1
| Self::StackedDRG64GiBV1P1
| Self::StackedDRG64GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow64GiBV1P1),
| Self::StackedDRG64GiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG64GiBV1P1_Feat_NiPoRep => Ok(StackedDRGWindow64GiBV1P1),
Self::StackedDRG32GiBV1
| Self::StackedDRG32GiBV1P1
| Self::StackedDRG32GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow32GiBV1P1),
| Self::StackedDRG32GiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG32GiBV1P1_Feat_NiPoRep => Ok(StackedDRGWindow32GiBV1P1),
Self::StackedDRG2KiBV1
| Self::StackedDRG2KiBV1P1
| Self::StackedDRG2KiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow2KiBV1P1),
| Self::StackedDRG2KiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG2KiBV1P1_Feat_NiPoRep => Ok(StackedDRGWindow2KiBV1P1),
Self::StackedDRG8MiBV1
| Self::StackedDRG8MiBV1P1
| Self::StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow8MiBV1P1),
| Self::StackedDRG8MiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG8MiBV1P1_Feat_NiPoRep => Ok(StackedDRGWindow8MiBV1P1),
Self::StackedDRG512MiBV1
| Self::StackedDRG512MiBV1P1
| Self::StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow512MiBV1P1),
| Self::StackedDRG512MiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG512MiBV1P1_Feat_NiPoRep => Ok(StackedDRGWindow512MiBV1P1),
Self::Invalid(_) => Err(format!(
"Unsupported mapping from {:?} to PoSt-window RegisteredProof",
self
Expand All @@ -253,19 +283,24 @@ impl RegisteredSealProof {
match self {
Self::StackedDRG64GiBV1
| Self::StackedDRG64GiBV1P1
| Self::StackedDRG64GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG64GiBV1),
| Self::StackedDRG64GiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG64GiBV1P1_Feat_NiPoRep => Ok(StackedDRG64GiBV1),
Self::StackedDRG32GiBV1
| Self::StackedDRG32GiBV1P1
| Self::StackedDRG32GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG32GiBV1),
| Self::StackedDRG32GiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG32GiBV1P1_Feat_NiPoRep => Ok(StackedDRG32GiBV1),
Self::StackedDRG2KiBV1
| Self::StackedDRG2KiBV1P1
| Self::StackedDRG2KiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG2KiBV1),
| Self::StackedDRG2KiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG2KiBV1P1_Feat_NiPoRep => Ok(StackedDRG2KiBV1),
Self::StackedDRG8MiBV1
| Self::StackedDRG8MiBV1P1
| Self::StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG8MiBV1),
| Self::StackedDRG8MiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG8MiBV1P1_Feat_NiPoRep => Ok(StackedDRG8MiBV1),
Self::StackedDRG512MiBV1
| Self::StackedDRG512MiBV1P1
| Self::StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG512MiBV1),
| Self::StackedDRG512MiBV1P1_Feat_SyntheticPoRep
| Self::StackedDRG512MiBV1P1_Feat_NiPoRep => Ok(StackedDRG512MiBV1),
Self::Invalid(_) => Err(format!(
"Unsupported mapping from {:?} to Update RegisteredProof",
self
Expand Down Expand Up @@ -349,6 +384,12 @@ i64_conversion! {
StackedDRG512MiBV1P1_Feat_SyntheticPoRep => 12,
StackedDRG32GiBV1P1_Feat_SyntheticPoRep => 13,
StackedDRG64GiBV1P1_Feat_SyntheticPoRep => 14,

StackedDRG2KiBV1P1_Feat_NiPoRep => 15,
StackedDRG8MiBV1P1_Feat_NiPoRep => 16,
StackedDRG512MiBV1P1_Feat_NiPoRep => 17,
StackedDRG32GiBV1P1_Feat_NiPoRep => 18,
StackedDRG64GiBV1P1_Feat_NiPoRep => 19,
}

i64_conversion! {
Expand Down Expand Up @@ -410,6 +451,21 @@ impl TryFrom<RegisteredSealProof> for filecoin_proofs_api::RegisteredSealProof {
Ok(Self::StackedDrg512MiBV1_1_Feat_SyntheticPoRep)
}
Invalid(i) => Err(format!("unsupported proof type: {}", i)),
StackedDRG2KiBV1P1_Feat_NiPoRep => {
Ok(Self::StackedDrg2KiBV1_2_Feat_NonInteractivePoRep)
}
StackedDRG512MiBV1P1_Feat_NiPoRep => {
Ok(Self::StackedDrg512MiBV1_2_Feat_NonInteractivePoRep)
}
StackedDRG8MiBV1P1_Feat_NiPoRep => {
Ok(Self::StackedDrg8MiBV1_2_Feat_NonInteractivePoRep)
}
StackedDRG32GiBV1P1_Feat_NiPoRep => {
Ok(Self::StackedDrg32GiBV1_2_Feat_NonInteractivePoRep)
}
StackedDRG64GiBV1P1_Feat_NiPoRep => {
Ok(Self::StackedDrg64GiBV1_2_Feat_NonInteractivePoRep)
}
}
}
}
Expand Down
Loading