Skip to content

Commit 2f9dff7

Browse files
committed
Merge branch 'main' into return-message-type
2 parents a401baf + 6669eaf commit 2f9dff7

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ updates:
33
- package-ecosystem: github-actions
44
directory: /
55
schedule:
6-
interval: daily
6+
interval: weekly
7+
groups:
8+
actions-deps:
9+
patterns:
10+
- "*"
11+
712
- package-ecosystem: cargo
813
directory: /
914
schedule:
10-
interval: daily
15+
interval: weekly
1116
ignore:
1217
- dependency-name: "*"
1318
update-types:

.github/workflows/cla.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ on:
66
types: [opened, closed, synchronize]
77

88
permissions:
9-
actions: write
10-
contents: write
11-
pull-requests: write
12-
statuses: write
9+
contents: read
1310

1411
jobs:
1512
CLAAssistant:
1613
runs-on: ubuntu-latest
14+
permissions:
15+
actions: write
16+
pull-requests: write
17+
statuses: write
1718
steps:
1819
- name: Harden the runner (Audit all outbound calls)
1920
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
@@ -47,7 +48,7 @@ jobs:
4748
remote-organization-name: 'OpenZeppelin'
4849
remote-repository-name: 'cla-sigs'
4950
custom-notsigned-prcomment: >
50-
Thank you for your contribution to OpenZeppelin Safe Utils.
51+
Thank you for your contribution to OpenZeppelin Event Scanner.
5152
Before being able to integrate those changes, we would like you to
5253
sign our [Contributor License Agreement](https://github.com/OpenZeppelin/cla-assistant/blob/main/openzeppelin_2025_cla.md).
5354

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ jobs:
5252
path: results.sarif
5353
retention-days: 5
5454
- name: Upload SARIF to GitHub Code Scanning
55-
uses: github/codeql-action/upload-sarif@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.29.5
55+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
5656
with:
5757
sarif_file: results.sarif

osv-scanner.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[[IgnoredVulns]]
2+
id = "RUSTSEC-2024-0388"
3+
reason = "The crate is unmaintained, but it works. If there is any new vulnerability, there will be another ID."
4+
5+
[[IgnoredVulns]]
6+
id = "RUSTSEC-2024-0436"
7+
reason = "The crate is unmaintained, but it works. If there is any new vulnerability, there will be another ID."
8+

src/event_scanner.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,11 @@ pub type EventScannerMessage = ScannerMessage<Vec<Log>, EventScannerError>;
3333
#[derive(Error, Debug, Clone)]
3434
pub enum EventScannerError {
3535
#[error("Block range scanner error: {0}")]
36-
BlockRangeScanner(BlockRangeScannerError),
36+
BlockRangeScanner(#[from] BlockRangeScannerError),
3737
#[error("Provider error: {0}")]
3838
Provider(Arc<RpcError<TransportErrorKind>>),
3939
}
4040

41-
impl From<BlockRangeScannerError> for EventScannerError {
42-
fn from(e: BlockRangeScannerError) -> Self {
43-
EventScannerError::BlockRangeScanner(e)
44-
}
45-
}
46-
4741
impl From<RpcError<TransportErrorKind>> for EventScannerError {
4842
fn from(e: RpcError<TransportErrorKind>) -> Self {
4943
EventScannerError::Provider(Arc::new(e))

0 commit comments

Comments
 (0)