Skip to content

Commit

Permalink
chore: use actor cids from the manifest (#4564)
Browse files Browse the repository at this point in the history
  • Loading branch information
LesnyRumcajs authored Jul 19, 2024
1 parent 4b42f1e commit 531d928
Show file tree
Hide file tree
Showing 26 changed files with 357 additions and 60 deletions.
58 changes: 29 additions & 29 deletions Cargo.lock

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

25 changes: 13 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ digest = "0.10"
directories = "5"
displaydoc = "0.2"
ethereum-types = "0.14"
fil_actor_account_state = { version = "15.2" }
fil_actor_cron_state = { version = "15.2" }
fil_actor_datacap_state = { version = "15.2" }
fil_actor_init_state = { version = "15.2" }
fil_actor_interface = { version = "15.2" }
fil_actor_market_state = { version = "15.2" }
fil_actor_miner_state = { version = "15.2" }
fil_actor_power_state = { version = "15.2" }
fil_actor_reward_state = { version = "15.2" }
fil_actor_system_state = { version = "15.2" }
fil_actor_verifreg_state = { version = "15.2" }
fil_actors_shared = { version = "15.2", features = ["json"] }
fil_actor_account_state = { version = "16.0.0" }
fil_actor_cron_state = { version = "16.0.0" }
fil_actor_datacap_state = { version = "16.0.0" }
fil_actor_init_state = { version = "16.0.0" }
fil_actor_interface = { version = "16.0.0" }
fil_actor_market_state = { version = "16.0.0" }
fil_actor_miner_state = { version = "16.0.0" }
fil_actor_power_state = { version = "16.0.0" }
fil_actor_reward_state = { version = "16.0.0" }
fil_actor_system_state = { version = "16.0.0" }
fil_actor_verifreg_state = { version = "16.0.0" }
fil_actors_shared = { version = "16.0.0", features = ["json"] }
flume = "0.11"
fs_extra = "1"
futures = "0.3"
Expand Down Expand Up @@ -196,6 +196,7 @@ zstd = "0.13"
# optional dependencies
console-subscriber = { version = "0.3", features = ["parking_lot"], optional = true }
mimalloc = { version = "0.1", optional = true, default-features = false }
paste = "1.0.15"
tikv-jemallocator = { version = "0.5", optional = true }
tracing-chrome = { version = "0.7", optional = true }
tracing-loki = { version = "0.2", default-features = false, features = ["compat-0-2-1", "rustls"], optional = true }
Expand Down
67 changes: 67 additions & 0 deletions build/manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,71 @@
[
{
"network": {
"type": "calibnet"
},
"version": "8.0.0-rc.1",
"bundle_cid": "bafy2bzacedrdn6z3z7xz7lx4wll3tlgktirhllzqxb766dxpaqp3ukxsjfsba",
"manifest": {
"actors": [
[
"system",
1,
"bafk2bzaceaqrkllksxv2jsfgjvmuewx5vbzrammw5mdscod6gkdr3ijih2q64"
],
[
"init",
2,
"bafk2bzaceadyfilb22bcvzvnpzbg2lyg6npmperyq6es2brvzjdh5rmywc4ry"
],
[
"cron",
3,
"bafk2bzaceaxlezmclw5ugldhhtfgvn7yztux45scqik3ez4yhwiqhg5ssib44"
],
[
"account",
4,
"bafk2bzacecruossn66xqbeutqx5r4k2kjzgd43frmwd4qkw6haez44ubvvpxo"
],
[
"storagepower",
5,
"bafk2bzacecpwr4mynn55bg5hrlns3osvg7sty3rca6zlai3vl52vbbjk7ulfa"
],
[
"storageminer",
6,
"bafk2bzacea6rabflc7kpwr6y4lzcqsnuahr4zblyq3rhzrrsfceeiw2lufrb4"
],
[
"storagemarket",
7,
"bafk2bzacebotg5coqnglzsdrqxtkqk2eq4krxt6zvds3i3vb2yejgxhexl2n6"
],
[
"paymentchannel",
8,
"bafk2bzaceblot4pemhfgwb3lceellwrpgxaqkpselzbpqu32maffpopdunlha"
],
[
"multisig",
9,
"bafk2bzacec66wmb4kohuzvuxsulhcgiwju7sqkldwfpmmgw7dbbwgm5l2574q"
],
[
"reward",
10,
"bafk2bzaceayah37uvj7brl5no4gmvmqbmtndh5raywuts7h6tqbgbq2ge7dhu"
],
[
"verifiedregistry",
11,
"bafk2bzaceaihibfu625lbtzdp3tcftscshrmbgghgrc7kzqhxn4455pycpdkm"
]
],
"actor_list_cid": "bafy2bzacec7ewi4djlixcaqzaqpivf3pdzgdhlh5bvbj2qvgdpuuih22tt3aq"
}
},
{
"network": {
"type": "calibnet"
Expand Down
1 change: 1 addition & 0 deletions src/fil_cns/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use crate::chain::ChainStore;
use crate::chain_sync::collect_errs;
use crate::metrics::HistogramTimerExt;
use crate::networks::{ChainConfig, Height};
use crate::shim::actors::PowerActorStateLoad as _;
use crate::shim::crypto::{
cid_to_replica_commitment_v1, verify_bls_sig, TICKET_RANDOMNESS_LOOKBACK,
};
Expand Down
1 change: 1 addition & 0 deletions src/fil_cns/weight.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0, MIT

use crate::blocks::Tipset;
use crate::shim::actors::PowerActorStateLoad as _;
use crate::shim::{address::Address, state_tree::StateTree};
use fil_actor_interface::power;
use fvm_ipld_blockstore::Blockstore;
Expand Down
1 change: 1 addition & 0 deletions src/interpreter/fvm2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use crate::blocks::Tipset;
use crate::chain::{index::ChainIndex, store::ChainStore};
use crate::interpreter::errors::Error;
use crate::networks::ChainConfig;
use crate::shim::actors::MinerActorStateLoad as _;
use crate::shim::{
gas::{price_list_by_network_version, Gas, GasTracker},
state_tree::StateTree,
Expand Down
1 change: 1 addition & 0 deletions src/interpreter/fvm3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use crate::chain::{
};
use crate::interpreter::errors::Error;
use crate::networks::ChainConfig;
use crate::shim::actors::MinerActorStateLoad as _;
use crate::shim::{
address::Address, gas::price_list_by_network_version, state_tree::StateTree,
version::NetworkVersion,
Expand Down
1 change: 1 addition & 0 deletions src/interpreter/fvm4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use crate::chain::{
};
use crate::interpreter::errors::Error;
use crate::networks::{ChainConfig, Height, NetworkChain};
use crate::shim::actors::MinerActorStateLoad as _;
use crate::shim::{
address::Address, gas::price_list_by_network_version, state_tree::StateTree,
version::NetworkVersion,
Expand Down
1 change: 1 addition & 0 deletions src/interpreter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pub mod fvm3;
mod fvm4;
mod vm;

use crate::shim::actors::AccountActorStateLoad as _;
use crate::shim::{
address::{Address, Protocol},
state_tree::StateTree,
Expand Down
Loading

0 comments on commit 531d928

Please sign in to comment.