use fvm-ipld-bitfield

Cargo.toml

@@ -33,7 +33,6 @@ members = [
     "types/networks",
     "utils/auth",
     "utils/bigint",
-    "utils/bitfield",
     "utils/genesis",
     "utils/hash_utils",
     "utils/json_utils",
@@ -51,7 +50,6 @@ forest_db         = { path = "./node/db" }
 forest_crypto     = { path = "./crypto" }
 forest_address    = { path = "./vm/address" }
 forest_bigint     = { path = "./utils/bigint" }
-forest_bitfield   = { path = "./utils/bitfield" }
 forest_cid        = { path = "./ipld/cid" }
 forest_ipld       = { path = "./ipld" }
 forest_encoding   = { path = "./encoding" }

Makefile

@@ -35,7 +35,6 @@ clean:
 	@cargo clean -p forest_ipld
 	@cargo clean -p ipld_amt
 	@cargo clean -p forest_bigint
-	@cargo clean -p forest_bitfield
 	@cargo clean -p fil_types
 	@cargo clean -p ipld_blockstore
 	@cargo clean -p rpc

blockchain/state_manager/Cargo.toml

@@ -11,6 +11,7 @@ features = ["statediff"]
 anyhow = "1.0"
 fvm = "0.8"
 fvm_shared = { version = "0.7.1", default-features = false }
+fvm_ipld_bitfield = "0.5.2"
 fil_actors_runtime = "=7.5.1"
 address = { package = "forest_address", version = "0.3" }
 actor = { package = "actor_interface", path = "../../vm/actor_interface" }
@@ -39,7 +40,6 @@ message = { package = "forest_message", version = "0.7", features = [
     "blst",
 ] }
 vm = { package = "forest_vm", version = "0.3.1" }
-bitfield = { package = "forest_bitfield", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
 num-traits = "0.2.11"
 tokio = { version = "1.0", features = ["sync"] }

blockchain/state_manager/src/utils.rs

@@ -8,14 +8,14 @@ use actor::{
     power,
 };
 use address::Address;
-use bitfield::BitField;
 use blockstore::BlockStore;
 use cid::Cid;
 use fil_types::{
     verifier::ProofVerifier, NetworkVersion, Randomness, RegisteredSealProof, SectorInfo,
     SectorNumber,
 };
 use forest_blocks::Tipset;
+use fvm_ipld_bitfield::BitField;
 use interpreter::resolve_to_key_addr;
 use serde::Serialize;
 use state_tree::StateTree;

node/rpc-api/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2021"
 actor = { package = "actor_interface", path = "../../vm/actor_interface" }
 address = { package = "forest_address", version = "0.3", features = ["json"] }
 beacon = { package = "beacon", path = "../../blockchain/beacon", features = ["json"] }
-bitfield = { package = "forest_bitfield", version = "0.1", features = ["json"] }
 blocks = { package = "forest_blocks", path = "../../blockchain/blocks", features = ["json"] }
 blockstore = { package = "ipld_blockstore", version = "0.1" }
 chain = { path = "../../blockchain/chain", features = ["json"] }
@@ -32,6 +31,7 @@ serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = "1.0"
 libp2p = { version = "0.40.0-rc.1", default-features = false }
 fvm_shared = { version = "0.7.1", default-features = false }
+fvm_ipld_bitfield = { version = "0.5.2", features = ["json"] }
 
 [dependencies.jsonrpc-v2]
 version = "0.10"

node/rpc-api/src/data_types.rs

@@ -11,7 +11,6 @@ use serde::{Deserialize, Serialize};
 use actor::market::{DealProposal, DealState};
 use address::{json::AddressJson, Address};
 use beacon::{json::BeaconEntryJson, Beacon, BeaconSchedule};
-use bitfield::json::BitFieldJson;
 use blocks::{
     election_proof::json::ElectionProofJson, ticket::json::TicketJson,
     tipset_keys_json::TipsetKeysJson, Tipset,
@@ -23,6 +22,7 @@ use cid::{json::CidJson, Cid};
 use fil_types::{json::SectorInfoJson, sector::post::json::PoStProofJson};
 pub use forest_libp2p::{Multiaddr, Protocol};
 use forest_libp2p::{Multihash, NetworkMessage};
+use fvm_ipld_bitfield::json::BitFieldJson;
 use fvm_shared::bigint::BigInt;
 use fvm_shared::clock::ChainEpoch;
 use ipld::json::IpldJson;

node/rpc-api/src/lib.rs

@@ -360,12 +360,12 @@ pub mod state_api {
         MinerInfo, MinerPower, SectorOnChainInfo, SectorPreCommitInfo, SectorPreCommitOnChainInfo,
     };
     use address::json::AddressJson;
-    use bitfield::json::BitFieldJson;
     use blocks::{
         gossip_block::json::GossipBlockJson as BlockMsgJson, tipset_keys_json::TipsetKeysJson,
     };
     use cid::json::CidJson;
     use fil_types::{deadlines::DeadlineInfo, NetworkVersion, SectorNumber};
+    use fvm_ipld_bitfield::json::BitFieldJson;
     use fvm_shared::clock::ChainEpoch;
     use message::{
         message_receipt::json::MessageReceiptJson, unsigned_message::json::UnsignedMessageJson,

node/rpc/Cargo.toml

@@ -32,7 +32,6 @@ auth = { path = "../../utils/auth" }
 beacon = { package = "beacon", path = "../../blockchain/beacon", features = [
     "json",
 ] }
-bitfield = { package = "forest_bitfield", version = "0.1", features = ["json"] }
 blocks = { package = "forest_blocks", path = "../../blockchain/blocks", features = [
     "json",
 ] }
@@ -64,6 +63,7 @@ wallet = { package = "key_management", path = "../../key_management", features =
     "json",
 ] }
 fvm_shared = { version = "0.7.1", default-features = false }
+fvm_ipld_bitfield = "0.5.2"
 
 [dependencies.jsonrpc-v2]
 version          = "0.10"

node/rpc/src/state_api.rs

@@ -761,9 +761,9 @@ pub(crate) async fn state_miner_sector_allocated<
         miner::State::V7(m) => data
             .chain_store
             .db
-            .get::<bitfield::BitField>(&m.allocated_sectors)?
+            .get::<fvm_ipld_bitfield::BitField>(&m.allocated_sectors)?
             .ok_or("allocated sectors bitfield not found")?
-            .get(sector_num as usize),
+            .get(sector_num),
     };
 
     Ok(allocated_sectors)