Skip to content

Commit 7cd2e66

Browse files
committed
Merge branch 'main' into feat/update-metrics
2 parents ba486d5 + b1bc845 commit 7cd2e66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2033
-1056
lines changed

.github/workflows/bench.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ jobs:
2626
with:
2727
tool: cargo-codspeed
2828
- name: Build the benchmark target(s)
29-
run: cargo codspeed build -p scroll-derivation-pipeline
29+
run: cargo codspeed build -p scroll-derivation-pipeline --profile profiling
3030
- name: Run the benchmarks
31-
uses: CodSpeedHQ/action@v3
31+
uses: CodSpeedHQ/action@v4
3232
with:
33+
mode: instrumentation
3334
run: cargo codspeed run --workspace

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
latest=false
5151
5252
- name: Login to Docker Hub
53-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
53+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef #v3.6.0
5454
with:
5555
username: ${{ secrets.DOCKERHUB_USERNAME }}
5656
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/sequencer-migration-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
latest=false
3232
3333
- name: Login to Docker Hub
34-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
34+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef #v3.6.0
3535
with:
3636
username: ${{ secrets.DOCKERHUB_USERNAME }}
3737
password: ${{ secrets.DOCKERHUB_TOKEN }}

Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ significant_drop_tightening = "allow"
115115
too_long_first_doc_paragraph = "allow"
116116
large_enum_variant = "allow"
117117

118+
# Use the `--profile profiling` flag to show symbols in release mode.
119+
# e.g. `cargo build --profile profiling`
120+
[profile.profiling]
121+
inherits = "release"
122+
debug = "full"
123+
strip = "none"
124+
118125
[workspace.dependencies]
119126
# alloy
120127
alloy-chains = { version = "0.2.5", default-features = false }

crates/chain-orchestrator/src/error.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use alloy_transport::TransportErrorKind;
44
use rollup_node_primitives::{BatchInfo, BlockInfo};
55
use rollup_node_sequencer::SequencerError;
66
use rollup_node_signer::SignerError;
7-
use scroll_db::{DatabaseError, L1MessageKey};
7+
use scroll_db::{CanRetry, DatabaseError, L1MessageKey};
88
use scroll_engine::EngineError;
99

1010
/// A type that represents an error that occurred in the chain orchestrator.
@@ -93,3 +93,12 @@ pub enum ChainOrchestratorError {
9393
#[error("An error occurred while handling rollup node primitives: {0}")]
9494
RollupNodePrimitiveError(rollup_node_primitives::RollupNodePrimitiveError),
9595
}
96+
97+
impl CanRetry for ChainOrchestratorError {
98+
fn can_retry(&self) -> bool {
99+
match &self {
100+
Self::DatabaseError(err) => err.can_retry(),
101+
_ => false,
102+
}
103+
}
104+
}

0 commit comments

Comments
 (0)