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

Ni-PoREP (temp, working branch for testing) #1546

Closed
wants to merge 15 commits into from
Closed

Ni-PoREP (temp, working branch for testing) #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6473c89
Added verify NI to fvm
NemanjaLu92 Apr 12, 2024
6b0cc72
Update integration tests
NemanjaLu92 Apr 12, 2024
874742f
Added integration test for niporep that does not do anything sensible
NemanjaLu92 Apr 12, 2024
e9198d5
sectors added to state
NemanjaLu92 Apr 12, 2024
aedc94c
add pledge calculation and expiration
NemanjaLu92 Apr 15, 2024
e141961
Add basic checks, precalculate pledge, introduce randomness lookback
NemanjaLu92 Apr 23, 2024
868c39d
Remove ni verify
NemanjaLu92 Apr 23, 2024
f121bc4
Add more checks and mock expectations to pass unit test
NemanjaLu92 Apr 25, 2024
8a8d180
Review comments
NemanjaLu92 May 15, 2024
92f7c27
Add aggregated proof and unit test
NemanjaLu92 May 15, 2024
cf2afe9
Add aggregate proof integration test
NemanjaLu92 May 15, 2024
e9ca526
make compile
rvagg May 25, 2024
eaecc1c
chore: update fvm
rvagg May 27, 2024
308f0c0
fix: enrol miner in cron for niporep
rvagg May 27, 2024
8208b8e
temp: remove some validations
rvagg Jun 3, 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
1,414 changes: 912 additions & 502 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 34 additions & 23 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ members = [
"runtime",
"test_vm",
"vm_api",
"integration_tests"
"integration_tests",
]

[workspace.package]
Expand Down Expand Up @@ -54,10 +54,16 @@ fil_actors_runtime = { workspace = true }
num-traits = { workspace = true }

[dependencies]
clap = { version = "4.3.0", features = ["derive", "std", "help", "usage", "error-context"], default-features = false }
clap = { version = "4.3.0", features = [
"derive",
"std",
"help",
"usage",
"error-context",
], default-features = false }

[features]
default = [] ## translates to mainnet
default = [] ## translates to mainnet
mainnet = []
caterpillarnet = []
butterflynet = []
Expand Down Expand Up @@ -109,22 +115,27 @@ rlp = { version = "0.5.1", default-features = false }
substrate-bn = { version = "0.6.0", default-features = false }

# IPLD/Encoding
cid = { version = "0.10.1", default-features = false, features = ["serde-codec", "std"] }
multihash = { version = "0.18.1", default-features = false , features = ["multihash-impl"]}
cid = { version = "0.10.1", default-features = false, features = [
"serde-codec",
"std",
] }
multihash = { version = "0.18.1", default-features = false, features = [
"multihash-impl",
] }
libipld-core = { version = "0.13.1", features = ["serde-codec"] }
integer-encoding = { version = "3.0.3", default-features = false }

# helix-onchain
fvm_actor_utils = "9.0.0"
frc42_dispatch = "5.0.0"
frc46_token = "9.0.0"
fvm_actor_utils = "10.0.0"
frc42_dispatch = "6.0.0"
frc46_token = "10.0.0"

# FVM
fvm_sdk = "~4.0"
fvm_shared = "~4.0"
fvm_sdk = "~4.2"
fvm_shared = "~4.2"
fvm_ipld_encoding = "0.4.0"
fvm_ipld_blockstore = "0.2.0"
fvm_ipld_hamt = "0.8.0"
fvm_ipld_hamt = "0.9.0"
fvm_ipld_kamt = "0.3.0"
fvm_ipld_amt = { version = "0.6.2" }
fvm_ipld_bitfield = "0.6.0"
Expand All @@ -148,7 +159,7 @@ fil_actor_system = { path = "actors/system" }
fil_actor_verifreg = { path = "actors/verifreg" }
fil_actors_evm_shared = { path = "actors/evm/shared" }
fil_actors_runtime = { path = "runtime" }
fil_builtin_actors_state = { path = "state"}
fil_builtin_actors_state = { path = "state" }
fil_actors_integration_tests = { version = "1.0.0", path = "integration_tests" }
vm_api = { version = "1.0.0", path = "vm_api" }
test_vm = { path = "test_vm" }
Expand All @@ -168,14 +179,14 @@ test_vm = { path = "test_vm" }
## Uncomment when working locally on ref-fvm and this repo simultaneously.
## Assumes the ref-fvm checkout is in a sibling directory with the same name.
## (Valid while FVM modules aren't published to crates.io)
#[patch."https://github.com/filecoin-project/ref-fvm"]
#fvm_shared = { path = "../ref-fvm/shared" }
#fvm_sdk = { path = "../ref-fvm/sdk" }
#fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
#fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
#fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
#fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"}
#fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"}
# [patch."https://github.com/filecoin-project/ref-fvm"]
fvm_shared = { path = "../ref-fvm/shared" }
fvm_sdk = { path = "../ref-fvm/sdk" }
fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield" }
fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding" }
fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore" }

## Uncomment entries below when working locally on ref-fvm and this repo simultaneously.
## Assumes the ref-fvm checkout is in a sibling directory with the same name.
Expand All @@ -188,9 +199,9 @@ test_vm = { path = "test_vm" }
# fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
# fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"}
# fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"}
#fvm_actor_utils = { path = "../../filecoin/fvm_actor_utils"}
#frc42_dispatch = { path = "../../filecoin/frc42_dispatch"}
#frc46_token = { path = "../../filecoin/frc46_token"}
fvm_actor_utils = { path = "../filecoin/fvm_actor_utils"}
frc42_dispatch = { path = "../filecoin/frc42_dispatch"}
frc46_token = { path = "../filecoin/frc46_token"}

[profile.wasm]
inherits = "release"
Expand Down
1 change: 1 addition & 0 deletions actors/miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ fil_actor_power = { workspace = true }
fil_actor_market = { workspace = true }
rand = { workspace = true }
test-case = { workspace = true }
test-log = "0.2.15"

[features]
fil-actor = ["fil_actors_runtime/fil-actor"]
15 changes: 10 additions & 5 deletions actors/miner/src/commd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,20 @@ fn zero_commd(seal_proof: RegisteredSealProof) -> Result<Cid, ActorError> {
seal_proof.update_to_v1();
let i = match seal_proof {
RegisteredSealProof::StackedDRG2KiBV1P1
| RegisteredSealProof::StackedDRG2KiBV1P1_Feat_SyntheticPoRep => 0,
| RegisteredSealProof::StackedDRG2KiBV1P1_Feat_SyntheticPoRep
| RegisteredSealProof::StackedDRG2KiBV1P1_Feat_NiPoRep => 0,
RegisteredSealProof::StackedDRG512MiBV1P1
| RegisteredSealProof::StackedDRG512MiBV1P1_Feat_SyntheticPoRep => 1,
| RegisteredSealProof::StackedDRG512MiBV1P1_Feat_SyntheticPoRep
| RegisteredSealProof::StackedDRG512MiBV1P1_Feat_NiPoRep => 1,
RegisteredSealProof::StackedDRG8MiBV1P1
| RegisteredSealProof::StackedDRG8MiBV1P1_Feat_SyntheticPoRep => 2,
| RegisteredSealProof::StackedDRG8MiBV1P1_Feat_SyntheticPoRep
| RegisteredSealProof::StackedDRG8MiBV1P1_Feat_NiPoRep => 2,
RegisteredSealProof::StackedDRG32GiBV1P1
| RegisteredSealProof::StackedDRG32GiBV1P1_Feat_SyntheticPoRep => 3,
| RegisteredSealProof::StackedDRG32GiBV1P1_Feat_SyntheticPoRep
| RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep => 3,
RegisteredSealProof::StackedDRG64GiBV1P1
| RegisteredSealProof::StackedDRG64GiBV1P1_Feat_SyntheticPoRep => 4,
| RegisteredSealProof::StackedDRG64GiBV1P1_Feat_SyntheticPoRep
| RegisteredSealProof::StackedDRG64GiBV1P1_Feat_NiPoRep => 4,
_ => {
return Err(actor_error!(illegal_argument, "unknown SealProof"));
}
Expand Down
Loading
Loading