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

Actors v4 (Network v12) #1087

Merged
merged 28 commits into from
Apr 29, 2021
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
112 changes: 92 additions & 20 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion blockchain/blocks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ num-bigint = { path = "../../utils/bigint", package = "forest_bigint" }
sha2 = { version = "0.9", default-features = false }
thiserror = "1.0"
vm = { package = "forest_vm", version = "0.3.1" }
fil_types = "0.1"
fil_types = "0.2"
base64 = { version = "0.13", optional = true }
forest_json_utils = { path = "../../utils/json_utils", optional = true }
lazy_static = "1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion blockchain/chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ tokio = { version = "1.0", features = ["sync"] }
address = { package = "forest_address", version = "0.3" }
futures = "0.3.5"
async-std = { version = "1.9", features = ["tokio1"] }
types = { package = "fil_types", version = "0.1" }
types = { package = "fil_types", version = "0.2" }
lazy_static = "1.4"
interpreter = { path = "../../vm/interpreter/" }
lru = "0.6"
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 @@ -30,7 +30,7 @@ futures-util = "0.3.5"
lru = "0.6"
thiserror = "1.0"
num-traits = "0.2"
fil_types = "0.1"
fil_types = "0.2"
commcid = { path = "../../utils/commcid" }
clock = { package = "fil_clock", path = "../../node/clock" }
serde = { version = "1.0", features = ["derive", "rc"] }
Expand Down
2 changes: 1 addition & 1 deletion blockchain/message_pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async-std = { version = "1.9", features = ["tokio1"] }
state_manager = { path = "../state_manager" }
async-trait = "0.1"
interpreter = { path = "../../vm/interpreter/" }
types = { package = "fil_types", version = "0.1" }
types = { package = "fil_types", version = "0.2" }
forest_libp2p = { path = "../../node/forest_libp2p" }
num-traits = "0.2"
statrs = "0.13.0"
Expand Down
4 changes: 2 additions & 2 deletions blockchain/state_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ chain = { path = "../chain" }
async-std = { version = "1.9", features = ["unstable", "tokio1"] }
async-log = "2.0.0"
log = "0.4.8"
fil_types = "0.1"
fil_types = "0.2"
message = { package = "forest_message", version = "0.7", features = ["json", "blst"] }
vm = { package = "forest_vm", version = "0.3.1" }
bitfield = { package = "forest_bitfield", version = "0.1" }
Expand All @@ -37,7 +37,7 @@ num-traits = "0.2.11"
tokio = { version = "1.0", features = ["sync"] }
filecoin-proofs-api = { version = "6.1", features = ["blst"], default_features = false }
futures = "0.3.5"
runtime = { package = "forest_runtime", version = "0.1" }
runtime = { package = "forest_runtime", version = "0.2" }
lazy_static = "1.4"
once_cell = "1.5"
forest_crypto = { version = "0.5", features = ["blst"] }
Expand Down
2 changes: 1 addition & 1 deletion forest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ beacon = { path = "../blockchain/beacon" }
hex = "0.4.2"
rpc = { path = "../node/rpc" }
rpc_client = { package = "rpc-client", path = "../node/rpc-client" }
fil_types = "0.1"
fil_types = "0.2"
serde_json = "1.0"
message_pool = { package = "message_pool", path = "../blockchain/message_pool" }
wallet = { package = "key_management", path = "../key_management" }
Expand Down
2 changes: 1 addition & 1 deletion ipld/amt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 1.0.0 [UNRELEASED]
# 1.0.0 [2021-04-19]

- Dynamic bit width functionality
- Updates serialized format, this is a breaking change
Expand Down
2 changes: 1 addition & 1 deletion ipld/amt/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ipld_amt"
description = "Sharded IPLD Array implementation."
version = "0.2.1"
version = "1.0.0"
license = "MIT OR Apache-2.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion ipld/hamt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 2.0.0 [UNRELEASED]
# 2.0.0 [2021-04-19]

- `set_if_absent` function added. This inserts a value only if the key does not already exist in the Hamt.
- `set` now doesn't require flushes when the value set is equal to the one that already exists. This is needed for go interop and removes the need for an extra flush or checking if exists in a separate operation.
Expand Down
2 changes: 1 addition & 1 deletion node/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ cid = { package = "forest_cid", version = "0.3", features = ["json"] }
clock = { package = "fil_clock", path = "../clock" }
crypto = { package = "forest_crypto", version = "0.5", features = ["json", "blst"] }
encoding = { package = "forest_encoding", version = "0.2.1" }
fil_types = "0.1"
fil_types = "0.2"
forest_libp2p = { path = "../forest_libp2p" }
interpreter = { path = "../../vm/interpreter/" }
ipld = { package = "forest_ipld", path = "../../ipld", features = ["json"] }
Expand Down
6 changes: 6 additions & 0 deletions node/rpc/src/state_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,12 @@ pub(crate) async fn state_miner_sector_allocated<
.get::<bitfield::BitField>(&m.allocated_sectors)?
.ok_or("allocated sectors bitfield not found")?
.get(sector_num as usize),
miner::State::V4(m) => data
.chain_store
.db
.get::<bitfield::BitField>(&m.allocated_sectors)?
.ok_or("allocated sectors bitfield not found")?
.get(sector_num as usize),
};

Ok(allocated_sectors)
Expand Down
4 changes: 2 additions & 2 deletions tests/conformance_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ address = { package = "forest_address", version = "0.3", features = [
"json"
], optional = true }
base64 = { version = "0.13", optional = true }
runtime = { package = "forest_runtime", version = "0.1", optional = true }
runtime = { package = "forest_runtime", version = "0.2", optional = true }
state_manager = { path = "../../blockchain/state_manager", optional = true }
interpreter = { path = "../../vm/interpreter/", optional = true }
num-bigint = { path = "../../utils/bigint", package = "forest_bigint", optional = true }
vm = { package = "forest_vm", version = "0.3.1", optional = true }
blockstore = { package = "ipld_blockstore", version = "0.1", features = ["resolve"], optional = true }
crypto = { package = "forest_crypto", version = "0.5", features = ["blst"], optional = true }
encoding = { package = "forest_encoding", version = "0.2.1", optional = true }
fil_types = { version = "0.1", optional = true }
fil_types = { version = "0.2", optional = true }
forest_message = { version = "0.7", features = ["json", "blst"], optional = true }
state_tree = { path = "../../vm/state_tree/", optional = true }
chain = { path = "../../blockchain/chain", 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 @@ -17,7 +17,7 @@ cid = { package = "forest_cid", version = "0.3", features = ["cbor", "json"] }
serde_json = "1.0"
hex = "0.4.2"
vm = { package = "forest_vm", version = "0.3.1" }
fil_types = "0.1"
fil_types = "0.2"
address = { package = "forest_address", version = "0.3" }
forest_message = { version = "0.7", features = ["json", "blst"] }
encoding = { package = "forest_encoding", version = "0.2.1" }
Expand Down
2 changes: 1 addition & 1 deletion types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "fil_types"
description = "Filecoin types used in Forest."
version = "0.1.11"
version = "0.2.0"
license = "MIT OR Apache-2.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"
Expand Down
4 changes: 3 additions & 1 deletion types/networks/src/devnet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ pub const UPGRADE_CLAUS_HEIGHT: ChainEpoch = 343200;
pub const UPGRADE_ACTORS_V3_HEIGHT: ChainEpoch = 550321;
/// V11 network upgrade
pub const UPGRADE_NORWEGIAN_HEIGHT: ChainEpoch = 665280;
/// V12 network upgrade TODO
pub const UPGRADE_ACTORS_V4_HEIGHT: ChainEpoch = 999999;

pub const UPGRADE_PLACEHOLDER_HEIGHT: ChainEpoch = 9999999;

/// Current network version for the network
pub const NEWEST_NETWORK_VERSION: NetworkVersion = NetworkVersion::V11;
pub const NEWEST_NETWORK_VERSION: NetworkVersion = NetworkVersion::V12;

/// Bootstrap peer ids
pub const DEFAULT_BOOTSTRAP: &[&str] = &[];
Expand Down
Loading