Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: solidity coding style by NicolasRampoldi · Pull Request #843 · yetanotherco/aligned_layer · GitHub
Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: solidity coding style by NicolasRampoldi · Pull Request #843 · yetanotherco/aligned_layer · GitHub
Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: solidity coding style by NicolasRampoldi · Pull Request #843 · yetanotherco/aligned_layer · GitHub
Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: solidity coding style by NicolasRampoldi · Pull Request #843 · yetanotherco/aligned_layer · GitHub
Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: solidity coding style by NicolasRampoldi · Pull Request #843 · yetanotherco/aligned_layer · GitHub
Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: solidity coding style by NicolasRampoldi · Pull Request #843 · yetanotherco/aligned_layer · GitHub
Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix: solidity coding style by NicolasRampoldi · Pull Request #843 · yetanotherco/aligned_layer · GitHub
Skip to content
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,4 @@ docs/

data/

node_modules/
13 changes: 13 additions & 0 deletions contracts/.solhint.json
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1 @@
src/core/ERC20Mock.sol
Loading