Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dependabot/cargo/patc…
Browse files Browse the repository at this point in the history
…h-versions-1ca9c895af
  • Loading branch information
hanabi1224 committed Jan 6, 2025
2 parents fe47193 + 0c6707b commit 3af99ce
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 50 deletions.
17 changes: 6 additions & 11 deletions .config/lychee.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,15 @@

verbose = "debug"
no_progress = true
exclude_path = [
"./node_modules",
"./docs/node_modules",
"./documentation",
"./target"
]
exclude_path = ["./node_modules", "./docs/node_modules", "./documentation", "./target"]
exclude = [
# Avoid Github rate limits
"github.com/ChainSafe/forest",
# Requires CAPTCHA verification
"faucet.calibnet.chainsafe-fil.io/funds.html"
# Avoid Github rate limits
"github.com/ChainSafe/forest",
# Requires CAPTCHA verification
"faucet.calibnet.chainsafe-fil.io/funds.html",
]
timeout = 30
max_retries = 6
retry_wait_time = 10

output = "lychee-report.md"
output = "lychee-report.md"
2 changes: 1 addition & 1 deletion .github/workflows/forest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ jobs:
name: 'forest-${{ runner.os }}'
- name: Run api compare tests
run: ./scripts/tests/api_compare/setup.sh
timeout-minutes: '${{ fromJSON(env.SCRIPT_TIMEOUT_MINUTES) }}'
timeout-minutes: 120 # '${{ fromJSON(env.SCRIPT_TIMEOUT_MINUTES) }}'
- name: Dump docker logs
if: always()
uses: jwalton/gh-docker-logs@v2
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@

### Added

### Changed

### Removed

### Fixed

## Forest v.0.23.3 "Plumber"

Mandatory release for calibnet node operators. It fixes a sync error at epoch 2281645.

### Breaking

### Added

- [#5020](https://github.com/ChainSafe/forest/issues/5020) Add support for the
`Filecoin.EthGetTransactionByBlockNumberAndIndex` RPC method.

Expand All @@ -41,6 +55,8 @@

### Fixed

- [#5109](https://github.com/ChainSafe/forest/pull/5109) Fix a calibnet sync error at epoch 2281645.

## Forest v.0.23.2 "Feint"

Mandatory release for calibnet node operators. It removes the NV25 _Teep_ network upgrade from the schedule. Read more [here](https://github.com/filecoin-project/community/discussions/74#discussioncomment-11549619).
Expand Down
2 changes: 1 addition & 1 deletion 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 Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forest-filecoin"
version = "0.23.2"
version = "0.23.3"
authors = ["ChainSafe Systems <[email protected]>"]
repository = "https://github.com/ChainSafe/forest"
edition = "2021"
Expand Down
11 changes: 1 addition & 10 deletions src/interpreter/fvm2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use fvm_shared2::{
clock::ChainEpoch,
consensus::{ConsensusFault, ConsensusFaultType},
};
use tracing::error;

pub struct ForestExternsV2<DB> {
rand: Box<dyn Rand>,
Expand Down Expand Up @@ -226,14 +225,6 @@ impl<DB: Blockstore + Send + Sync + 'static> Consensus for ForestExternsV2<DB> {
Some(fault_type) => {
// (4) expensive final checks

let bail = |err| {
// When a lookup error occurs we should just bail terminating all the
// computations.
error!("database lookup error: {err}");
self.bail.store(true, Ordering::Relaxed);
Err(err)
};

// check blocks are properly signed by their respective miner
// note we do not need to check extra's: it is a parent to block b
// which itself is signed, so it was willingly included by the miner
Expand All @@ -242,7 +233,7 @@ impl<DB: Blockstore + Send + Sync + 'static> Consensus for ForestExternsV2<DB> {
match res {
// invalid consensus fault: cannot verify block header signature
Err(Error::Signature(_)) => return Ok((None, total_gas)),
Err(Error::Lookup(err)) => return bail(err),
Err(Error::Lookup(_)) => return Ok((None, total_gas)),
Ok(gas_used) => total_gas += gas_used,
}
}
Expand Down
14 changes: 2 additions & 12 deletions src/interpreter/fvm3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::chain::{
ChainStore,
};
use crate::interpreter::errors::Error;
use crate::interpreter::resolve_to_key_addr;
use crate::networks::ChainConfig;
use crate::shim::actors::miner;
use crate::shim::actors::MinerActorStateLoad as _;
Expand All @@ -32,9 +33,6 @@ use fvm_shared3::{
clock::ChainEpoch,
consensus::{ConsensusFault, ConsensusFaultType},
};
use tracing::error;

use crate::interpreter::resolve_to_key_addr;

pub struct ForestExterns<DB> {
rand: Box<dyn Rand>,
Expand Down Expand Up @@ -248,14 +246,6 @@ impl<DB: Blockstore + Send + Sync + 'static> Consensus for ForestExterns<DB> {
Some(fault_type) => {
// (4) expensive final checks

let bail = |err| {
// When a lookup error occurs we should just bail terminating all the
// computations.
error!("database lookup error: {err}");
self.bail.store(true, Ordering::Relaxed);
Err(err)
};

// check blocks are properly signed by their respective miner
// note we do not need to check extra's: it is a parent to block b
// which itself is signed, so it was willingly included by the miner
Expand All @@ -264,7 +254,7 @@ impl<DB: Blockstore + Send + Sync + 'static> Consensus for ForestExterns<DB> {
match res {
// invalid consensus fault: cannot verify block header signature
Err(Error::Signature(_)) => return Ok((None, total_gas)),
Err(Error::Lookup(err)) => return bail(err),
Err(Error::Lookup(_)) => return Ok((None, total_gas)),
Ok(gas_used) => total_gas += gas_used,
}
}
Expand Down
17 changes: 3 additions & 14 deletions src/interpreter/fvm4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::chain::{
ChainStore,
};
use crate::interpreter::errors::Error;
use crate::interpreter::resolve_to_key_addr;
use crate::networks::{ChainConfig, Height, NetworkChain};
use crate::shim::actors::miner;
use crate::shim::actors::MinerActorStateLoad as _;
Expand All @@ -32,9 +33,6 @@ use fvm_shared4::{
clock::ChainEpoch,
consensus::{ConsensusFault, ConsensusFaultType},
};
use tracing::error;

use crate::interpreter::resolve_to_key_addr;

pub struct ForestExterns<DB> {
rand: Box<dyn Rand>,
Expand Down Expand Up @@ -83,9 +81,8 @@ impl<DB: Blockstore + Send + Sync + 'static> ForestExterns<DB> {
) -> anyhow::Result<(Address, i64)> {
if height < self.epoch - self.chain_config.policy.chain_finality {
bail!(
"cannot get worker key (current epoch: {}, height: {})",
"cannot get worker key (current epoch: {}, height: {height}, miner address: {miner_addr})",
self.epoch,
height
);
}

Expand Down Expand Up @@ -271,14 +268,6 @@ impl<DB: Blockstore + Send + Sync + 'static> Consensus for ForestExterns<DB> {
Some(fault_type) => {
// (4) expensive final checks

let bail = |err| {
// When a lookup error occurs we should just bail terminating all the
// computations.
error!("database lookup error: {err}");
self.bail.store(true, Ordering::Relaxed);
Err(err)
};

// check blocks are properly signed by their respective miner
// note we do not need to check extra's: it is a parent to block b
// which itself is signed, so it was willingly included by the miner
Expand All @@ -287,7 +276,7 @@ impl<DB: Blockstore + Send + Sync + 'static> Consensus for ForestExterns<DB> {
match res {
// invalid consensus fault: cannot verify block header signature
Err(Error::Signature(_)) => return Ok((None, total_gas)),
Err(Error::Lookup(err)) => return bail(err),
Err(Error::Lookup(_)) => return Ok((None, total_gas)),
Ok(gas_used) => total_gas += gas_used,
}
}
Expand Down

0 comments on commit 3af99ce

Please sign in to comment.