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

chore: merge contracts and system-contracts repos #98

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
2a4f141
chore: system folder renamed to system-contracts
benceharomi Nov 17, 2023
1cf2cc9
chore: zksync folder renamed to l2-contracts
benceharomi Nov 17, 2023
50c297e
chore: zksync paths changed to l2-contracts
benceharomi Nov 17, 2023
3712e18
chore: ethereum folder renamed to l1-contracts
benceharomi Nov 17, 2023
37cd64f
chore: ethereum paths changed to l1-contracts
benceharomi Nov 17, 2023
66f9814
chore: root package.json added with workspaces
benceharomi Nov 17, 2023
6ddfad8
chore: yarn packages renamed
benceharomi Nov 17, 2023
3e2bee9
Fix bridge upgrade script (#103)
StanislavBreadless Nov 28, 2023
a8429e8
Disallow L2 weth upgrade (#107)
StanislavBreadless Dec 1, 2023
bfe5de9
ci: workflows split
benceharomi Dec 4, 2023
74ec493
Merge remote-tracking branch 'origin/main' into bh-evm-298-merge-cont…
benceharomi Dec 4, 2023
c438489
ci: system-contracts workdir
benceharomi Dec 4, 2023
9b82548
ci: cache keys fix
benceharomi Dec 4, 2023
f772aeb
ci: duplicate workflows removed
benceharomi Dec 4, 2023
87b2da5
ci: SC workflow name
benceharomi Dec 4, 2023
6674cfd
ci: SC cache path fix
benceharomi Dec 4, 2023
22ade8e
fix: l2-contracts test
benceharomi Dec 4, 2023
ec2d6d1
ci: sc era-test-node logs path
benceharomi Dec 4, 2023
7c09efc
ci: l2-contracts test
benceharomi Dec 4, 2023
266cb6a
Revert "ci: sc era-test-node logs path"
benceharomi Dec 4, 2023
a5fee0b
ci: sc era-test-node logs path
benceharomi Dec 4, 2023
98f3a1e
ci: excluding private workspace package from license check
benceharomi Dec 4, 2023
65c6cf8
ci: license check missing license name added
benceharomi Dec 4, 2023
f4c98e8
chore: lint configs moved to a single shared config
benceharomi Dec 5, 2023
47ca24b
chore: duplicate files removed from the system-contracts dir
benceharomi Dec 5, 2023
d75c675
chore: formatting fix
benceharomi Dec 5, 2023
9eed282
chore: githooks fix
benceharomi Dec 5, 2023
beeb722
chore: yarn-error to gitignore
benceharomi Dec 5, 2023
ca1b06a
chore: gitignores merged
benceharomi Dec 5, 2023
896792e
chore: workspace shortcuts
benceharomi Dec 5, 2023
cc721b7
chore: prettierignore cleaned
benceharomi Dec 5, 2023
f2c7624
ci: l1-contracts ci fix
benceharomi Dec 6, 2023
2ca56b7
ci: l1-contracts foundry test command fix
benceharomi Dec 6, 2023
08e1708
ci: l2-contracts-ci fix
benceharomi Dec 6, 2023
7f5ed76
ci: sc ci fix
benceharomi Dec 6, 2023
cb6e974
ci: trigger changed
benceharomi Dec 6, 2023
13b81bf
ci: sc reordered jobs
benceharomi Dec 6, 2023
79cf26c
ci: sc bootloader test path fix
benceharomi Dec 6, 2023
9be2c25
docs: sc yarn commands updated
benceharomi Dec 6, 2023
a20a2e5
Scripts for governance (#92)
StanislavBreadless Dec 12, 2023
734559f
chore: sc dependencies checked
benceharomi Dec 13, 2023
49514b6
Merge remote-tracking branch 'origin/main' into bh-evm-298-merge-cont…
benceharomi Dec 13, 2023
ded8517
lint
benceharomi Dec 13, 2023
dafe592
fix: sc hardhat config typechain import
benceharomi Dec 13, 2023
75fa67d
fix: utils sc readBytecode paths updated
benceharomi Dec 13, 2023
67e61af
fix: paths updated in scripts
benceharomi Dec 13, 2023
22c2849
fix: imports updated typechain-types to typechain
benceharomi Dec 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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
Loading