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

fix: solidity coding style #843

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
17bd36f
ci: add solhint to ci
NicolasRampoldi Aug 22, 2024
210af8c
fix: linter warnings
NicolasRampoldi Aug 22, 2024
8c29f5b
fix: newline
NicolasRampoldi Aug 22, 2024
6ec87ba
fix: modifier before functions
NicolasRampoldi Aug 22, 2024
54026f3
refactor: change requires for revert with custom errors
NicolasRampoldi Aug 22, 2024
7d79014
Merge branch 'main' into 835-fix-solidity-coding-style-guideline-viol…
NicolasRampoldi Aug 22, 2024
a49ed0f
fix: merge conflicts
NicolasRampoldi Aug 22, 2024
332b080
feat: add lint to makefile
NicolasRampoldi Aug 22, 2024
d780e6d
Merge branch 'main' into 835-fix-solidity-coding-style-guideline-viol…
NicolasRampoldi Aug 23, 2024
0677327
chore: merge conflicts
NicolasRampoldi Aug 23, 2024
3bb64cd
refactor: move events and errors to interface
NicolasRampoldi Aug 23, 2024
c9b32e9
refactor: if else statement
NicolasRampoldi Aug 23, 2024
a0fdcd2
refactor: change user_data to senderData
NicolasRampoldi Aug 23, 2024
0191794
refactor: change user_data to signerData
NicolasRampoldi Aug 23, 2024
ca7c797
fix: linter
NicolasRampoldi Aug 23, 2024
e5614be
fix: linter
NicolasRampoldi Aug 23, 2024
0d69dbb
chore: anvil state
NicolasRampoldi Aug 23, 2024
8550d23
chore: anvil state
NicolasRampoldi Aug 23, 2024
bfdf79b
Merge branch 'main' into 835-fix-solidity-coding-style-guideline-viol…
NicolasRampoldi Aug 23, 2024
51bc162
chore: anvil state
NicolasRampoldi Aug 23, 2024
9190dc1
ci: add max-warnings 0
NicolasRampoldi Aug 23, 2024
4f9d4a0
ci: test ci to fail
NicolasRampoldi Aug 23, 2024
1cb2866
fix: linter
NicolasRampoldi Aug 23, 2024
f1829b2
Merge branch 'main' into 835-fix-solidity-coding-style-guideline-viol…
NicolasRampoldi Aug 23, 2024
f830819
chore: anvil state
NicolasRampoldi Aug 23, 2024
b4f256c
Merge branch 'main' into 835-fix-solidity-coding-style-guideline-viol…
NicolasRampoldi Aug 26, 2024
c5e8d30
chore: anvil state
NicolasRampoldi Aug 26, 2024
a20bc09
feat: add make show_aligned_error_codes
uri-99 Aug 26, 2024
28feaa8
feat: add error codes in errors, directly on the contracts
uri-99 Aug 26, 2024
4392f54
Merge branch 'main' into 835-fix-solidity-coding-style-guideline-viol…
NicolasRampoldi Aug 26, 2024
f537707
chore: merge conflicts
NicolasRampoldi Aug 26, 2024
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
29 changes: 29 additions & 0 deletions .github/workflows/lint-contracts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Lint contracts
on:
push:
branches: [main]
pull_request:
branches: ["*"]
paths:
- "contracts/src/core/*.sol"
- ".github/workflows/lint-contracts.yml"

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install dependencies
run: npm install
working-directory: contracts

- name: Run Solhint
run: npm run lint:sol
working-directory: contracts
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ anvil_upgrade_index_registry:
@echo "Upgrading Index Registry Contracts..."
. contracts/scripts/anvil/upgrade_index_registry.sh

lint_contracts:
@cd contracts && npm run lint:sol

anvil_start:
@echo "Starting Anvil..."
anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
Expand Down Expand Up @@ -441,6 +444,12 @@ upgrade_batcher_payment_service:
build_aligned_contracts:
@cd contracts/src/core && forge build

show_aligned_error_codes:
@echo "\nAlignedLayerServiceManager errors:"
@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
@echo "\nBatcherPaymentService errors:"
@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
@echo "Building aggregator..."
Expand Down
1 change: 1 addition & 0 deletions contracts/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"extends": "solhint:recommended",
"rules": {
"func-visibility": [
"warn",
{
"ignoreConstructors": true
}
],
"no-complex-fallback": "off",
"func-name-mixedcase": "off"
}
}
1 change: 1 addition & 0 deletions contracts/.solhintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
Loading