Merge branch 'main' into hm/f3-backup-kad

ChainSafe · Jan 7, 2025 · fc58928 · fc58928
2 parents 2004a19 + 5fd0d19
commit fc58928
Show file tree

Hide file tree

Showing 479 changed files with 482 additions and 477 deletions.
diff --git a/benches/car-index.rs b/benches/car-index.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use cid::Cid;

diff --git a/benches/example-benchmark.rs b/benches/example-benchmark.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 //! ```console
 //! $ cargo bench --bench example-benchmark

diff --git a/build.rs b/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 fn main() {

diff --git a/build/known_blocks.yaml b/build/known_blocks.yaml
@@ -7,6 +7,7 @@
 #
 # This file is maintained monthly - see `CHECKPOINT_ISSUE_TEMPLATE.md`
 calibnet:
+  2246400: bafy2bzaceara2wzb65zghnvhzws7ayz263fruzjdbssglcihnewyzl3wuh7tu
   2160000: bafy2bzaceaq6zgokrh5zrmwj42vsjqecog3sf4s467rw7oydh5zpglj2dh6x2
   2073600: bafy2bzacedcwoydjsj6cchl5jjsr3xxtkwrzw6odlr2cdqcoayf2n7ckt726q
   1987200: bafy2bzacebzdntcwbrm3v3lnbg2rklmszioovtgl5zhht63monwh7bl42xctm
@@ -33,6 +34,8 @@ calibnet:
   172800: bafy2bzacebluce5la2lbyjlgmup6mx4xytnnilsf4oy6v4omon2ivyduqwlsq
   86400: bafy2bzaceatx7tlwdhez6vyias5qlhaxa54vjftigbuqzfsmdqduc6jdiclzc
 mainnet:
+  4579200: bafy2bzacedqcxixbnahfo7nuailcmrgxwuz2gfllqehns4wdcz7lbpjt4ngly
+  4492800: bafy2bzacedqovzmnjvrrccnfqf6n25tfqccjcevvcbdfmswrtxejz3qfa5732
   4406400: bafy2bzacecgml5dar3tlve23wx25ebsq4r6gk3nnlf36vbgyq3ntl3ifbmvyw
   4320000: bafy2bzacea6lfgw5gmi7fznzwfy4hcd6krludno6rfne62ys6wmhdynix4dqi
   4233600: bafy2bzacecqo64vedu4l2xwzhu63dnbcmbfi4uamk7lkegxv6luxfkaoel376

diff --git a/interop-tests/build.rs b/interop-tests/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 fn main() {

diff --git a/interop-tests/src/lib.rs b/interop-tests/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 #[cfg(test)]

diff --git a/interop-tests/src/tests/bitswap_go_compat.rs b/interop-tests/src/tests/bitswap_go_compat.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::go_ffi::*;

diff --git a/interop-tests/src/tests/go_ffi.rs b/interop-tests/src/tests/go_ffi.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 pub mod binding {

diff --git a/interop-tests/src/tests/kad_go_compat.rs b/interop-tests/src/tests/kad_go_compat.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::go_ffi::*;

diff --git a/interop-tests/src/tests/mod.rs b/interop-tests/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 mod go_ffi;

diff --git a/scripts/add_license.sh b/scripts/add_license.sh
@@ -3,7 +3,7 @@
 # Checks if the source code contains required license and adds it if necessary.
 # Returns 1 if there was a missing license, 0 otherwise.
 
-PAT_APA="^// Copyright 2019-2024 ChainSafe Systems// SPDX-License-Identifier: Apache-2.0, MIT$"
+PAT_APA="^// Copyright 2019-2025 ChainSafe Systems// SPDX-License-Identifier: Apache-2.0, MIT$"
 
 ret=0
 for file in $(git grep --cached -Il '' -- '*.rs' ':!*src/utils/encoding/fallback_de_ipld_dagcbor.rs'); do

diff --git a/scripts/copyright.txt b/scripts/copyright.txt
@@ -1,2 +1,2 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
diff --git a/scripts/tests/calibnet_no_discovery_check.sh b/scripts/tests/calibnet_no_discovery_check.sh
@@ -7,6 +7,7 @@ source "$(dirname "$0")/harness.sh"
 
 $FOREST_PATH --chain calibnet --encrypt-keystore false --mdns false --kademlia false --auto-download-snapshot --log-dir "$LOG_DIRECTORY" --save-token ./admin_token &
 FOREST_NODE_PID=$!
+sleep 10s # to allow admin_token being saved
 FULLNODE_API_INFO="$(cat admin_token):/ip4/127.0.0.1/tcp/2345/http"
 export FULLNODE_API_INFO
 
@@ -20,3 +21,4 @@ until [[ $($FOREST_CLI_PATH f3 certs get --output json | jq '.GPBFTInstance') -g
     sleep 1s;
 done
 kill -KILL $FOREST_NODE_PID
+sleep 5s
diff --git a/src/auth/mod.rs b/src/auth/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::key_management::KeyInfo;

diff --git a/src/beacon/beacon_entries.rs b/src/beacon/beacon_entries.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::utils::encoding::serde_byte_array;

diff --git a/src/beacon/drand.rs b/src/beacon/drand.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::time::Duration;

diff --git a/src/beacon/mock_beacon.rs b/src/beacon/mock_beacon.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::DrandNetwork;

diff --git a/src/beacon/mod.rs b/src/beacon/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 pub mod beacon_entries;

diff --git a/src/beacon/signatures/mod.rs b/src/beacon/signatures/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 mod public_key_impls;

diff --git a/src/beacon/signatures/public_key_impls.rs b/src/beacon/signatures/public_key_impls.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::*;

diff --git a/src/beacon/signatures/signature_impls.rs b/src/beacon/signatures/signature_impls.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::*;

diff --git a/src/beacon/signatures/tests.rs b/src/beacon/signatures/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::beacon::BeaconEntry;

diff --git a/src/beacon/tests/drand.rs b/src/beacon/tests/drand.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::{

diff --git a/src/bin/forest-cli.rs b/src/bin/forest-cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 fn main() -> anyhow::Result<()> {

diff --git a/src/bin/forest-tool.rs b/src/bin/forest-tool.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 fn main() -> anyhow::Result<()> {

diff --git a/src/bin/forest-wallet.rs b/src/bin/forest-wallet.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 fn main() -> anyhow::Result<()> {

diff --git a/src/bin/forest.rs b/src/bin/forest.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 fn main() -> anyhow::Result<()> {

diff --git a/src/blocks/block.rs b/src/blocks/block.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::message::SignedMessage;

diff --git a/src/blocks/chain4u.rs b/src/blocks/chain4u.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 //! This module contains [`Chain4U`] and [`chain4u!`], which together provide a

diff --git a/src/blocks/election_proof.rs b/src/blocks/election_proof.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::blocks::VRFProof;

diff --git a/src/blocks/gossip_block.rs b/src/blocks/gossip_block.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use cid::Cid;

diff --git a/src/blocks/header.rs b/src/blocks/header.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::ops::Deref;

diff --git a/src/blocks/mod.rs b/src/blocks/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use thiserror::Error;

diff --git a/src/blocks/tests/serialization_vectors.rs b/src/blocks/tests/serialization_vectors.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 /// These tests use the `serialization-vectors` submodule at the root of this repo

diff --git a/src/blocks/tests/ticket_test.rs b/src/blocks/tests/ticket_test.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::blocks::*;

diff --git a/src/blocks/ticket.rs b/src/blocks/ticket.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::blocks::VRFProof;

diff --git a/src/blocks/tipset.rs b/src/blocks/tipset.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::sync::Arc;

diff --git a/src/blocks/vrf_proof.rs b/src/blocks/vrf_proof.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::utils::encoding::{blake2b_256, serde_byte_array};

diff --git a/src/chain/mod.rs b/src/chain/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 pub mod store;
 mod weight;

diff --git a/src/chain/store/base_fee.rs b/src/chain/store/base_fee.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::blocks::Tipset;

diff --git a/src/chain/store/chain_store.rs b/src/chain/store/chain_store.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::{

diff --git a/src/chain/store/errors.rs b/src/chain/store/errors.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::fmt::Debug;

diff --git a/src/chain/store/index.rs b/src/chain/store/index.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::{num::NonZeroUsize, sync::Arc};

diff --git a/src/chain/store/mod.rs b/src/chain/store/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 pub mod base_fee;

diff --git a/src/chain/store/tipset_tracker.rs b/src/chain/store/tipset_tracker.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::{collections::BTreeMap, sync::Arc};

diff --git a/src/chain/weight.rs b/src/chain/weight.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 pub type Weight = num::BigInt;
diff --git a/src/chain_sync/bad_block_cache.rs b/src/chain_sync/bad_block_cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::num::NonZeroUsize;

diff --git a/src/chain_sync/chain_muxer.rs b/src/chain_sync/chain_muxer.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::{

diff --git a/src/chain_sync/consensus.rs b/src/chain_sync/consensus.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use futures::{stream::FuturesUnordered, StreamExt};

diff --git a/src/chain_sync/metrics.rs b/src/chain_sync/metrics.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use once_cell::sync::Lazy;

diff --git a/src/chain_sync/mod.rs b/src/chain_sync/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 mod bad_block_cache;

diff --git a/src/chain_sync/network_context.rs b/src/chain_sync/network_context.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::{

diff --git a/src/chain_sync/sync_state.rs b/src/chain_sync/sync_state.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::sync::Arc;

diff --git a/src/chain_sync/tipset_syncer.rs b/src/chain_sync/tipset_syncer.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::{

diff --git a/src/chain_sync/validation.rs b/src/chain_sync/validation.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use std::time::{SystemTime, UNIX_EPOCH};

diff --git a/src/cid_collections/hash_map.rs b/src/cid_collections/hash_map.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::{CidV1DagCborBlake2b256, MaybeCompactedCid, Uncompactable};

diff --git a/src/cid_collections/hash_set.rs b/src/cid_collections/hash_set.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::*;

diff --git a/src/cid_collections/mod.rs b/src/cid_collections/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 pub mod hash_map;
 pub mod hash_set;

diff --git a/src/cid_collections/small_cid_vec.rs b/src/cid_collections/small_cid_vec.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::*;

diff --git a/src/cli/humantoken.rs b/src/cli/humantoken.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 //! This module defines a [parser](parse()) and
 //! [pretty-printer](TokenAmountPretty::pretty) for

diff --git a/src/cli/main.rs b/src/cli/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::subcommands::Subcommand;

diff --git a/src/cli/mod.rs b/src/cli/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 pub mod humantoken;
 pub mod main;

diff --git a/src/cli/subcommands/auth_cmd.rs b/src/cli/subcommands/auth_cmd.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2024 ChainSafe Systems
+// Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::rpc::{self, auth::AuthNewParams, prelude::*};