Skip to content

Commit

Permalink
Merge pull request matter-labs#114 from matter-labs/bh-evm-298-merge-sc
Browse files Browse the repository at this point in the history
chore: merge contracts and system-contracts repos
  • Loading branch information
StanislavBreadless authored Dec 18, 2023
2 parents a20a2e5 + 28b399e commit 87cd8d7
Show file tree
Hide file tree
Showing 341 changed files with 24,411 additions and 7,365 deletions.
File renamed without changes.
File renamed without changes.
8 changes: 2 additions & 6 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ RED='\033[0;31m'

# Check that the code is formatted in the given directory provided in the first argument
function check_prettier {
cd $1
if ! yarn prettier:check; then
echo "${RED}Commit error! Cannot commit unformatted code!${NC}"
echo "Prettier errors found in the ${CYAN}$(pwd)${NC} directory."
echo "Please format the code via ${CYAN}cd $1 && yarn prettier:fix${NC}!"
echo "Prettier errors found. Please format the code via ${CYAN}yarn prettier:fix${NC}!"
exit 1
fi
cd ..
}

check_prettier "ethereum"
check_prettier "zksync"
check_prettier
8 changes: 2 additions & 6 deletions .githooks/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ RED='\033[0;31m'

# Checking that the code is linted and formatted in the given directory provided in the first argument
function check_lint {
cd $1
if ! yarn lint:check; then
echo "${RED}Push error! Cannot push unlinted code!${NC}"
echo "Lint errors found in the ${CYAN}$(pwd)${NC} directory."
echo "Please lint the code via ${CYAN}cd $1 && yarn lint:fix${NC} and/or fix the errors manually!"
echo "Lint errors found. Please lint the code via ${CYAN}yarn lint:fix${NC} and/or fix the errors manually!"
exit 1
fi
cd ..
}

check_lint "ethereum"
check_lint "zksync"
check_lint
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Scripts-Related Bug Report
about: Use this template for reporting script-related bugs. For contract-related bugs, see our security policy.
title: ''
title: ""
labels: bug
assignees: ''
assignees: ""
---

### 🐛 Script Bug Report
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Feature request
about: Use this template for requesting features
title: ''
title: ""
labels: feat
assignees: ''
assignees: ""
---

### 🌟 Feature Request
Expand Down
275 changes: 0 additions & 275 deletions .github/workflows/ci.yml

This file was deleted.

Loading

0 comments on commit 87cd8d7

Please sign in to comment.