Skip to content

Changes to walk_snapshot to match Forest and Lotus snapshots #2540

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

Merged
jdjaustin merged 8 commits into from
Feb 21, 2023
Merged

Changes to walk_snapshot to match Forest and Lotus snapshots #2540

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c17674
changes to walk_snapshot
Feb 13, 2023
459b875
lint and udep fixes
Feb 13, 2023
d5e3339
Merge branch 'main' into jdjaustin/issue-1884-match-lotus-snapshots
Feb 16, 2023
c131ab2
use mh code directly
LesnyRumcajs Feb 16, 2023
104030f
match Lotus logic for codec
Feb 17, 2023
c7141c6
Merge branch 'main' into jdjaustin/issue-1884-match-lotus-snapshots
Feb 21, 2023
3f16bbe
move codec `match` logic into identity `if` statement
Feb 21, 2023
f34e375
Merge branch 'main' into jdjaustin/issue-1884-match-lotus-snapshots
Feb 21, 2023
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
15 changes: 13 additions & 2 deletions blockchain/chain/src/store/chain_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ use ahash::{HashMap, HashMapExt, HashSet, HashSetExt};
use anyhow::Result;
use async_stream::stream;
use bls_signatures::Serialize as SerializeBls;
use cid::{multihash::Code::Blake2b256, Cid};
use cid::{
multihash::{Code, Code::Blake2b256},
Cid,
};
use digest::Digest;
use forest_actor_interface::EPOCHS_IN_DAY;
use forest_beacon::{BeaconEntry, IGNORE_DRAND_VAR};
Expand Down Expand Up @@ -564,7 +567,15 @@ where
.get(&cid)?
.ok_or_else(|| Error::Other(format!("Cid {cid} not found in blockstore")))?;

tx_clone.send_async((cid, block.clone())).await?;
// Don't include identity CIDs.
// We only include raw and dagcbor, for now.
// Raw for "code" CIDs.
if u64::from(Code::Identity) != cid.hash().code()
&& (cid.codec() == fvm_shared::IPLD_RAW
|| cid.codec() == fvm_ipld_encoding::DAG_CBOR)
{
tx_clone.send_async((cid, block.clone())).await?;
}
Ok(block)
}
})
Expand Down