Skip to content
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.

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

Rollup of 3 pull requests #2671

Merged
merged 3 commits into from
Jun 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/github_release_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@f6010ea70151369b06f0194be1051fbbdff851b2
uses: docker/build-push-action@31159d49c0d4756269a0940a750801a1ea5d7003
with:
context: .
file: Dockerfile
Expand Down
78 changes: 39 additions & 39 deletions 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 consensus/src/consensus/remote_data_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl<N: Network> RemoteDataStore<N> {
.collect());
} else {
// If the proof does not verify, we disconnect from the peer
log::debug!(peer = %peer_id, "Disconnecting from peer because the accounts proof didn't verify");
log::warn!(%peer_id, "Banning peer because the accounts proof didn't verify");
network
.disconnect_peer(peer_id, CloseReason::MaliciousPeer)
.await;
Expand Down
6 changes: 3 additions & 3 deletions consensus/src/sync/history/sync_clustering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl<TNetwork: Network> HistoryMacroSync<TNetwork> {
log::warn!(
num_epochs = macro_chain.epochs.len(),
%peer_id,
"Request macro chain failed: too many epochs returned"
"Banning peer because requesting macro chain failed: too many epochs returned"
);
network
.disconnect_peer(peer_id, CloseReason::MaliciousPeer)
Expand Down Expand Up @@ -102,8 +102,8 @@ impl<TNetwork: Network> HistoryMacroSync<TNetwork> {
log::warn!(
given_checkpoint_epoch,
expected_checkpoint_epoch,
peer = %peer_id,
"Request macro chain failed: invalid checkpoint",
%peer_id,
"Banning peer because requesting macro chain failed: invalid checkpoint",
);
network
.disconnect_peer(peer_id, CloseReason::MaliciousPeer)
Expand Down
4 changes: 2 additions & 2 deletions consensus/src/sync/light/sync_requests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl<TNetwork: Network> LightMacroSync<TNetwork> {
log::warn!(
num_epochs = macro_chain.epochs.len(),
%peer_id,
"Request macro chain failed: too many epochs returned"
"Banning peer because requesting macro chain failed: too many epochs returned"
);
network
.disconnect_peer(peer_id, CloseReason::MaliciousPeer)
Expand All @@ -120,7 +120,7 @@ impl<TNetwork: Network> LightMacroSync<TNetwork> {
block_number = checkpoint.block_number,
checkpoint_epoch,
%peer_id,
"Request macro chain failed: invalid checkpoint"
"Banning peer because requesting macro chain failed: invalid checkpoint"
);
network
.disconnect_peer(peer_id, CloseReason::MaliciousPeer)
Expand Down
Loading
Loading