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.

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

Update proofs and other deps #812

Merged
merged 4 commits into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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,142 changes: 614 additions & 528 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SER_TESTS = "tests/serialization_tests"
CONF_TESTS = "tests/conformance_tests"

install:
cargo install --path forest --force
cargo install --locked --path forest --force

clean-all:
cargo clean
Expand Down
6 changes: 3 additions & 3 deletions blockchain/beacon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
features = ["json"]

[dependencies]
ahash = "0.4"
ahash = "0.5"
async-std = { version = "1.6.3", features = ["unstable"] }
clock = { path = "../../node/clock" }
bls-signatures = "0.6.1"
Expand All @@ -17,13 +17,13 @@ encoding = { path = "../../encoding", package = "forest_encoding" }
sha2 = { version = "0.9", default-features = false }
byteorder = "1.3.4"
async-trait = "0.1"
base64 = { version = "0.12.1", optional = true }
base64 = { version = "0.13", optional = true }
forest_json_utils = { path = "../../utils/json_utils", optional = true }
surf = "2.0.0-alpha.4"
hex = "0.4.2"

[dev-dependencies]
base64 = "0.12.1"
base64 = "0.13"
async-std = { version = "1.6.3", features = ["unstable", "attributes"] }
serde_json = "1.0"

Expand Down
4 changes: 2 additions & 2 deletions blockchain/blocks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ sha2 = { version = "0.9", default-features = false }
thiserror = "1.0"
vm = { package = "forest_vm", path = "../../vm" }
fil_types = { path = "../../types" }
base64 = { version = "0.12.1", optional = true }
base64 = { version = "0.13", optional = true }
forest_json_utils = { path = "../../utils/json_utils", optional = true }
lazy_static = "1.4.0"

[dev-dependencies]
base64 = "0.12.1"
base64 = "0.13"
test_utils = { version = "0.1.0", path = "../../utils/test_utils/", features = ["test_constructors"] }
hex = "0.4.2"
serde_json = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion blockchain/chain_sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ interpreter = { path = "../../vm/interpreter/" }

[dev-dependencies]
test_utils = { version = "0.1.0", path = "../../utils/test_utils/", features = ["test_constructors"] }
base64 = "0.12.1"
base64 = "0.13"
genesis = { path = "../../utils/genesis", features = ["testing"] }
pretty_env_logger = "0.4.0"
forest_car = { path = "../../ipld/car" }
Expand Down
2 changes: 1 addition & 1 deletion blockchain/state_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ serde = { version = "1.0", features = ["derive"] }
ipld_hamt = { path = "../../ipld/hamt" }
num-traits = "0.2.11"
flo_stream = "0.4.0"
filecoin-proofs-api = "5.2"
filecoin-proofs-api = { version = "5.3", features = ["blst"], default_features = false }
futures = "0.3.5"
runtime = { path = "../../vm/runtime/" }
lazy_static = "1.4"
Expand Down
24 changes: 9 additions & 15 deletions blockchain/state_manager/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
// Copyright 2020 ChainSafe Systems
// SPDX-License-Identifier: Apache-2.0, MIT

#![allow(unused)]

use crate::errors::*;
use crate::StateManager;
use actor::miner::{self, Partition};
use actor::{
miner::{
ChainSectorInfo, Deadlines, MinerInfo, SectorOnChainInfo, SectorPreCommitOnChainInfo,
Sectors,
},
miner::{ChainSectorInfo, Deadlines, MinerInfo, SectorOnChainInfo, SectorPreCommitOnChainInfo},
power,
};
use address::{Address, Protocol};
use address::Address;
use bitfield::BitField;
use blockstore::BlockStore;
use cid::Cid;
use encoding::serde_bytes::ByteBuf;
use fil_types::{
verifier::ProofVerifier, Randomness, RegisteredSealProof, SectorInfo, SectorNumber, SectorSize,
verifier::ProofVerifier, Randomness, RegisteredSealProof, SectorInfo, SectorNumber,
HAMT_BIT_WIDTH,
};
use filecoin_proofs_api::{post::generate_winning_post_sector_challenge, ProverId};
use forest_blocks::Tipset;
use ipld_amt::Amt;
use ipld_hamt::Hamt;
Expand Down Expand Up @@ -53,11 +47,11 @@ where

let mut proving_sectors = BitField::new();

deadlines.for_each(store, |dl_idx, deadline| {
deadlines.for_each(store, |_, deadline| {
let partitions = deadline.partitions_amt(store)?;

let mut fault_sectors = BitField::new();
partitions.for_each(|part_idx, partition: &miner::Partition| {
partitions.for_each(|_, partition: &miner::Partition| {
proving_sectors |= &partition.sectors;
fault_sectors |= &partition.faults;
Ok(())
Expand Down Expand Up @@ -281,16 +275,16 @@ where
let miner_actor_state: miner::State =
self.load_actor_state(&address, tipset.parent_state())?;
let deadlines = miner_actor_state.load_deadlines(store)?;
let pa = deadlines.for_each(store, |i, deadline| {
deadlines.for_each(store, |_, deadline| {
let partitions = deadline.partitions_amt(store).map_err(|e| e.to_string())?;
partitions
.for_each(|i, part| {
cb(part);
.for_each(|_, part| {
cb(part)?;
Ok(())
})
.map_err(|e| e.to_string())?;
Ok(())
});
})?;

Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
num-traits = "0.2"
num-derive = "0.3.0"
thiserror = "1.0"
base64 = { version = "0.12.1", optional = true }
base64 = { version = "0.13", optional = true }

[dev-dependencies]
rand = "0.7.3"
Expand Down
2 changes: 1 addition & 1 deletion ipld/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ features = ["json"]
encoding = { package = "forest_encoding", path = "../encoding" }
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0"
multibase = { version = "0.8.0", optional = true }
multibase = { version = "0.9.0", optional = true }
async-trait = "0.1"
async-recursion = "0.3.1"
indexmap = { version = "1.3.2", features = ["serde-1"] }
Expand Down
4 changes: 2 additions & 2 deletions ipld/cid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ features = ["cbor", "json"]

[dependencies]
multihash = "0.10.0"
multibase = "0.8.0"
integer-encoding = "1.0.3"
multibase = "0.9.0"
integer-encoding = { version = "2.1", default-features = false }
serde = { version = "1.0", features = ["derive"], optional = true }
# TODO remove fork in future (allowing non utf8 strings to be cbor deserialized)
serde_cbor = { git = "https://github.com/ChainSafe/cbor", rev = "3e7bf81f57e9010762dbc12292bd6f927fdfe83a", features = ["tags"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion key_management/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ libsecp256k1 = "0.3.4"
rand = "0.7.3"
encoding = { package = "forest_encoding", path = "../encoding", version = "0.1" }
serde = { version = "1.0", features = ["derive"] }
base64 = { version = "0.12.1", optional = true }
base64 = { version = "0.13", optional = true }
serde_json = "1.0.57"
log = "0.4.8"

Expand Down
2 changes: 1 addition & 1 deletion node/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
rocksdb = { version = "0.14.0", optional = true }
rocksdb = { version = "0.15.0", optional = true }
parking_lot = "0.11"
encoding = { package = "forest_encoding", path = "../../encoding" }
thiserror = "1.0"
2 changes: 1 addition & 1 deletion node/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ forest_libp2p = { path = "../forest_libp2p" }
jsonwebtoken = "7.2.0"
auth = { path = "../../utils/auth"}
utils = { path = "../../node/utils" }
rand_distr = "0.2.2"
rand_distr = "0.3"
rand = "0.7"
interpreter = { path = "../../vm/interpreter/" }
fil_types = { path = "../../types" }
Expand Down
2 changes: 1 addition & 1 deletion tests/conformance_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ db = { path = "../../node/db/", optional = true }
address = { package = "forest_address", path = "../../vm/address", features = [
"json"
], optional = true }
base64 = { version = "0.12.1", optional = true }
base64 = { version = "0.13", optional = true }
runtime = { path = "../../vm/runtime/", optional = true }
state_manager = { path = "../../blockchain/state_manager", optional = true }
interpreter = { path = "../../vm/interpreter/", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion tests/serialization_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ submodule_tests = []
[dev-dependencies]
serde = { version = "1.0", features = ["derive"] }
crypto = { package = "forest_crypto", path = "../../crypto" }
base64 = { version = "0.12.1" }
base64 = { version = "0.13" }
cid = { package = "forest_cid", path = "../../ipld/cid", features = ["cbor", "json"] }
serde_json = "1.0"
hex = "0.4.2"
Expand Down
4 changes: 2 additions & 2 deletions types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ chrono = "0.4.9"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.56"
commcid = { path = "../utils/commcid" }
filecoin-proofs-api = { version = "5.2", optional = true }
filecoin-proofs-api = { version = "5.3", features = ["blst"], default_features = false, optional = true }
vm = { package = "forest_vm", path = "../vm" }
cid = { package = "forest_cid", path = "../ipld/cid", features = ["cbor"] }
num-bigint = { path = "../utils/bigint", package = "forest_bigint", features=["json"] }
num-traits = "0.2"
num-derive = "0.3.0"
encoding = { package = "forest_encoding", path = "../encoding" }
clock = { path = "../node/clock" }
base64 = { version = "0.12.1", optional = true }
base64 = { version = "0.13", optional = true }
forest_json_utils = { path = "../utils/json_utils", optional = true }
ipld_amt = { path = "../ipld/amt/" }
lazy_static = "1.4"
Expand Down
2 changes: 1 addition & 1 deletion utils/bitfield/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"
unsigned-varint = "0.5"
serde = { version = "1.0", features = ["derive"] }
serde_bytes = "0.11.3"
ahash = "0.4"
ahash = "0.5"

[dev-dependencies]
rand_xorshift = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion utils/commcid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
num-traits = "0.2"
cid = { package = "forest_cid", path = "../../ipld/cid" }
filecoin-proofs-api = "5.2"
filecoin-proofs-api = { version = "5.3", features = ["blst"], default_features = false }

[dev-dependencies]
rand = "0.7.3"
2 changes: 1 addition & 1 deletion utils/test_utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ crypto = { package = "forest_crypto", path = "../../crypto" }
async-std = { version = "1.6.3", features = ["unstable"] }
forest_libp2p = { path = "../../node/forest_libp2p/", optional = true }
encoding = { package = "forest_encoding", path = "../../encoding/"}
base64 = "0.12.1"
base64 = "0.13"

[features]
test_constructors = ["blocks", "chain", "cid", "message", "forest_libp2p"]
6 changes: 3 additions & 3 deletions vm/actor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ ipld_hamt = { path = "../../ipld/hamt", features = ["go-interop"] }
ipld_amt = { path = "../../ipld/amt", features = ["go-interop"] }
forest_ipld = { path = "../../ipld" }
unsigned-varint = "0.5"
integer-encoding = "1.1.5"
integer-encoding = { version = "2.1", default-features = false }
crypto = { package = "forest_crypto", path = "../../crypto" }
bitfield = { path = "../../utils/bitfield" }
fil_types = { path = "../../types" }
byteorder = "1.3.4"
ahash = "0.4"
base64 = "0.12.1"
ahash = "0.5"
base64 = "0.13"
log = "0.4.8"
commcid = { path = "../../utils/commcid" }
indexmap = { version = "1.3.2", features = ["serde-1"] }
Expand Down
2 changes: 1 addition & 1 deletion vm/interpreter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ log = "0.4.8"
db = { path = "../../node/db" }
chain = { path = "../../blockchain/chain" }
fil_types = { path = "../../types" }
ahash = "0.4"
ahash = "0.5"
lazy_static = "1.4"
rayon = "1.3"

Expand Down
2 changes: 1 addition & 1 deletion vm/message/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ encoding = { package = "forest_encoding", path = "../../encoding", version = "0.
crypto = { package = "forest_crypto", path = "../../crypto", version = "0.3.1" }
derive_builder = "0.9"
serde = { version = "1.0", features = ["derive"] }
base64 = { version = "0.12.1", optional = true }
base64 = { version = "0.13", optional = true }
forest_json_utils = { path = "../../utils/json_utils", optional = true, version = "0.1" }
num-traits = "0.2"
fil_types = { path = "../../types", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions vm/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ipld_blockstore = { path = "../../ipld/blockstore" }
clock = { path = "../../node/clock" }
forest_encoding = { path = "../../encoding" }
commcid = { path = "../../utils/commcid" }
filecoin-proofs-api = "5.2"
base64 = "0.12.1"
filecoin-proofs-api = { version = "5.3", features = ["blst"], default_features = false }
base64 = "0.13"
fil_types = { path = "../../types", features = ["proofs"] }
log = "0.4.8"

Expand Down