Skip to content

Commit ae6fe3d

Browse files
committed
chore: Pull from main
2 parents ee29391 + 7cd1c57 commit ae6fe3d

38 files changed

+271
-86
lines changed

.github/workflows/cla.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ on:
55
types: [created]
66
pull_request_target:
77
types: [opened, closed, synchronize, labeled]
8-
98
permissions:
109
actions: write
1110
contents: write
1211
pull-requests: write
1312
statuses: write
1413
checks: write
1514
issues: write
16-
1715
jobs:
1816
CLAAssistant:
1917
runs-on: ubuntu-latest
@@ -22,7 +20,6 @@ jobs:
2220
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2321
with:
2422
egress-policy: audit
25-
2623
- name: Checkout Private Repo for Allowlist
2724
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2825
with:
@@ -44,13 +41,11 @@ jobs:
4441
echo "is_allowed=true" >> $GITHUB_OUTPUT
4542
else
4643
echo "is_allowed=false" >> $GITHUB_OUTPUT
47-
fi
44+
fi
4845
- name: CLA Assistant
4946
continue-on-error: true
5047
id: cla_assistant
51-
if: (github.event.comment.body == 'recheck' || github.event.comment.body ==
52-
'I confirm that I have read and hereby agree to the OpenZeppelin Contributor
53-
License Agreement') || github.event_name == 'pull_request_target'
48+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I confirm that I have read and hereby agree to the OpenZeppelin Contributor License Agreement') || github.event_name == 'pull_request_target'
5449
uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
5550
env:
5651
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -63,17 +58,11 @@ jobs:
6358
remote-organization-name: OpenZeppelin
6459
remote-repository-name: cla-sigs
6560
custom-notsigned-prcomment: >
66-
Thank you for your contribution to OpenZeppelin Monitor.
67-
Before being able to integrate those changes, we would like you to
68-
sign our [Contributor License Agreement](https://github.com/OpenZeppelin/cla-assistant/blob/main/openzeppelin_2025_cla.md).
69-
70-
You can sign the CLA by just posting a Pull Request Comment with the sentence
71-
below. Thanks.
72-
custom-pr-sign-comment: I confirm that I have read and hereby agree to the
73-
OpenZeppelin Contributor License Agreement
74-
61+
Thank you for your contribution to OpenZeppelin Monitor. Before being able to integrate those changes, we would like you to sign our [Contributor License Agreement](https://github.com/OpenZeppelin/cla-assistant/blob/main/openzeppelin_2025_cla.md).
62+
You can sign the CLA by just posting a Pull Request Comment with the sentence below. Thanks.
63+
custom-pr-sign-comment: I confirm that I have read and hereby agree to the OpenZeppelin Contributor License Agreement
7564
- name: Label PR as CLA Unsigned
76-
if: ${{ steps.cla_assistant.outcome != 'success' }}
65+
if: ${{ steps.cla_assistant.outcome != 'success' && steps.check_allowlist.outputs.is_allowed == 'false' }}
7766
run: |
7867
if [[ "${{ github.event_name }}" == "pull_request_target" ]]; then
7968
PR_NUMBER="${{ github.event.pull_request.number }}"
@@ -88,10 +77,8 @@ jobs:
8877
-d '{"labels":["cla: unsigned"]}' \
8978
$ENDPOINT
9079
exit 1
91-
9280
- name: Label PR as CLA Signed
93-
if: ${{ steps.cla_assistant.outcome == 'success' && steps.check_allowlist.outputs.is_allowed
94-
== 'false' }}
81+
if: ${{ steps.cla_assistant.outcome == 'success' && steps.check_allowlist.outputs.is_allowed == 'false' }}
9582
run: |-
9683
if [[ "${{ github.event_name }}" == "pull_request_target" ]]; then
9784
PR_NUMBER="${{ github.event.pull_request.number }}"
@@ -112,7 +99,6 @@ jobs:
11299
-H "X-GitHub-Api-Version: 2022-11-28" \
113100
-d '{"labels":["cla: signed"]}' \
114101
$ENDPOINT
115-
116102
- name: Label PR as CLA Allowlist
117103
if: ${{ steps.check_allowlist.outputs.is_allowed == 'true' }}
118104
run: |-

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ data/**/*.json
2222

2323
# Ignore actual config files but not examples
2424
config/**/*.json
25-
!config/**/*.json.example
25+
!examples/config/**/*.json
2626

2727
# Ignore .env files
2828
.env

.pre-commit-config.yaml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
---
22
minimum_pre_commit_version: 3.5.0
3-
43
default_install_hook_types: [commit-msg, pre-commit, pre-push]
5-
6-
default_stages:
7-
- pre-commit
8-
- pre-push
9-
4+
default_stages: [pre-commit, pre-push]
105
ci:
116
autofix_commit_msg: 'chore(pre-commit): autofix run'
127
autoupdate_commit_msg: 'chore(pre-commit): autoupdate hooks'
13-
148
repos:
159
- repo: local
1610
hooks:
@@ -25,8 +19,7 @@ repos:
2519
entry: cargo fmt
2620
pass_filenames: false
2721
language: system
28-
types:
29-
- rust
22+
types: [rust]
3023
- id: clippy
3124
name: clippy
3225
entry: cargo clippy --all-targets --all-features -- -D warnings
@@ -43,9 +36,10 @@ repos:
4336
- id: trailing-whitespace
4437
- id: end-of-file-fixer
4538
- repo: https://github.com/lyz-code/yamlfix/
46-
rev: 0.9.0
39+
rev: 1.17.0
4740
hooks:
4841
- id: yamlfix
42+
args: [-c, .yamlfix.toml]
4943
- repo: https://github.com/crate-ci/committed
5044
rev: v1.1.5
5145
hooks:
@@ -60,5 +54,4 @@ repos:
6054
hooks:
6155
- id: conventional-pre-commit
6256
stages: [commit-msg]
63-
args: [--strict, build, chore, ci, docs, feat, fix, perf, refactor, revert,
64-
style, test]
57+
args: [--strict, build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test]

.yamlfix.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
allow_duplicate_keys = false
2+
line_length = 280
3+
sequence_style = "flow_style"

Cargo.lock

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

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ openzeppelin-monitor/
142142
├── docs/ # Documentation
143143
├── scripts/ # Utility scripts
144144
├── cmd/ # Metrics and monitoring
145+
├── examples/ # Example configuration files
145146
└── ... other root files (Cargo.toml, README.md, etc.)
146147
```
147148

config/filters/.keep

Whitespace-only changes.

config/monitors/.keep

Whitespace-only changes.

config/networks/.keep

Whitespace-only changes.

config/triggers/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)