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

Merge main into erc20 base token #9

Merged
merged 113 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
6336955
A new era
shahar4 Feb 15, 2023
4150422
Logo + disclaimer.
shahar4 Feb 17, 2023
e41215e
chore(security): add workflow for leaked secrets monitoring
otani88 Feb 20, 2023
5a6c728
Merge pull request #4 from matter-labs/secrets_monitoring
otani88 Feb 21, 2023
eb25eaa
Update README.md
shahar4 Mar 8, 2023
02a703e
Remove Apache license.
shahar4 Mar 8, 2023
ab2cba3
Updating to latest in dev.
shahar4 Mar 9, 2023
857da71
Fair Onboarding Alpha.
shahar4 Mar 24, 2023
e73b7b5
Add comment on EIP-1352
pcaversaccio Mar 30, 2023
4e0487b
Merge pull request #5 from pcaversaccio/patch-1
popzxc Apr 21, 2023
f083d87
Updating mirror
shahar4 May 31, 2023
28dbd2d
Updating mirror.
shahar4 May 31, 2023
7658f9a
Update README.md
shahar4 May 31, 2023
ae905bd
Updating mirror.
shahar4 Aug 23, 2023
de72432
mirror sync to 7381458849b42
mm-zk Sep 5, 2023
af730ec
Mirror to de404a390af2aa37ad23b2a543c5f1b408ca84bf (#11)
mm-zk Sep 5, 2023
66899a6
added missing file to mirror de404a390af2aa37ad (#12)
mm-zk Sep 5, 2023
87381ab
fix: bump hh deploy and solc versions (#13)
idea404 Sep 14, 2023
9826aa2
Add FOS Templates (#15)
shahar4 Sep 18, 2023
848eb19
chore: Syncs common workflows from the template into dev (#16)
yorik Sep 19, 2023
3e954a6
chore: Syncs common workflows from the template into main (#17)
yorik Sep 21, 2023
b6286ef
Syncing dev with main (#26)
benceharomi Sep 27, 2023
ef5e5f7
Boojum integration (#35)
StanislavBreadless Oct 4, 2023
ba9835a
chore: Upgrade to Node v18 (#20)
benceharomi Oct 5, 2023
0444347
feat: Adding compile CI (#21)
mm-zk Oct 6, 2023
ed2420a
feat: testing CI job (#38)
benceharomi Oct 10, 2023
1d18d2e
Testing framework for bootloader (#14)
mm-zk Oct 10, 2023
efc9637
feat: linting CI job (#40)
benceharomi Oct 16, 2023
08d54d5
feat: calculate-hashes command to detect contract changes (#37)
benceharomi Oct 18, 2023
0d38b70
feat: use boojum-integration branch of in-memory node for testing CI …
benceharomi Oct 20, 2023
68aaee1
ci: use era-test-node-action for the testing CI (#50)
benceharomi Oct 27, 2023
6ce4f8f
updated hh version and solidity version (#52)
koloz193 Oct 31, 2023
8a4349e
Set of fixes for boojum integration (#53)
StanislavBreadless Nov 1, 2023
6a84bef
sync with main
StanislavBreadless Nov 1, 2023
27d550a
chore: synchronise linting rules of repositories (#49)
benceharomi Nov 2, 2023
6c8a46a
sync with dev
StanislavBreadless Nov 2, 2023
6faac62
fix hardhat
StanislavBreadless Nov 2, 2023
1395b99
fmt
StanislavBreadless Nov 2, 2023
db5bbad
ignore invalid field
StanislavBreadless Nov 2, 2023
97208b7
Allow ts-ignore (#59)
StanislavBreadless Nov 3, 2023
18ab544
nits + use the same config as on L1
StanislavBreadless Nov 3, 2023
eab158c
update hashes
StanislavBreadless Nov 3, 2023
38ea20e
update hashes
StanislavBreadless Nov 3, 2023
8f09d7b
Merge pull request #54 from matter-labs/release-v18-boojum
StanislavBreadless Nov 5, 2023
3377d27
Use compatible error codes with the previous version (#64)
StanislavBreadless Nov 6, 2023
5227006
Merge pull request #65 from matter-labs/main
StanislavBreadless Nov 7, 2023
a604944
chore: normalise file path (#18)
ylmin Nov 7, 2023
010786f
ci: label-external-contributions workflow added
benceharomi Nov 7, 2023
6619454
ci: extension changed to yaml
benceharomi Nov 7, 2023
3f44c2a
make scripts work for upgrade
StanislavBreadless Nov 7, 2023
96d10b2
docs(readme): update zksync-era link (#48)
DKlupov Nov 8, 2023
ef9f578
docs: add Mirror link (#51)
Saladerl Nov 8, 2023
0e5b789
docs: fix Discord link (#55)
MartinKong1990 Nov 8, 2023
920e2e5
docs: zk credo added
benceharomi Nov 9, 2023
408dffd
Merge pull request #67 from matter-labs/readme-updates
StanislavBreadless Nov 10, 2023
b7cf389
remove admin and use governance owner as admin instead (#85)
koloz193 Nov 10, 2023
1cbcb62
correct todo
StanislavBreadless Nov 13, 2023
aa02d54
fix lint
StanislavBreadless Nov 13, 2023
61c11f6
Merge branch 'main' into sb-prepare-upgrade
StanislavBreadless Nov 13, 2023
e1578dd
fix system context
StanislavBreadless Nov 14, 2023
fe52dbe
Merge remote-tracking branch 'origin/sb-prepare-upgrade' into sb-prep…
StanislavBreadless Nov 14, 2023
ef4c3db
upd bootloader hash
StanislavBreadless Nov 14, 2023
a00ab9a
Merge pull request #71 from matter-labs/sb-prepare-upgrade
StanislavBreadless Nov 14, 2023
2491d56
ci: add workflow to label external-contributions (#91)
benceharomi Nov 15, 2023
d42f707
Merge pull request #66 from matter-labs/bh-evm-388-add-workflow-to-la…
StanislavBreadless Nov 15, 2023
156071a
chore: moved files into system folder
benceharomi Nov 16, 2023
986cafd
Merge branch 'bh-evm-298-merge-contracts-and-system-contracts-repos' …
benceharomi Nov 16, 2023
13435dd
Merge pull request #100 from matter-labs/main
StanislavBreadless Nov 20, 2023
52aa57f
Remove allow list (#77)
vladbochok Nov 21, 2023
dbb37fc
Merge pull request #77 from matter-labs/main
StanislavBreadless Nov 21, 2023
c947405
Upgrade zksolc version to 1.3.17 (#97)
thomas-nguy Nov 21, 2023
3e2bee9
Fix bridge upgrade script (#103)
StanislavBreadless Nov 28, 2023
a8429e8
Disallow L2 weth upgrade (#107)
StanislavBreadless Dec 1, 2023
3c6893d
Testing infrastructure improvements (#82)
AntonD3 Dec 11, 2023
a20a2e5
Scripts for governance (#92)
StanislavBreadless Dec 12, 2023
e77971d
chore: merge contracts and system-contracts repos (#98)
benceharomi Dec 18, 2023
5445270
Merge remote-tracking branch 'origin/main' into bh-evm-298-merge-sc
benceharomi Dec 18, 2023
28b399e
chore: fixed migrate-governance file path
benceharomi Dec 18, 2023
87cd8d7
Merge pull request #114 from matter-labs/bh-evm-298-merge-sc
StanislavBreadless Dec 18, 2023
4d01605
Merge branch 'main' into sync-dev-with-main
benceharomi Dec 18, 2023
9f13672
Merge branch 'bh-evm-298-merge-contracts-and-system-contracts-repos' …
benceharomi Dec 18, 2023
55b7f0d
Merge remote-tracking branch 'system-contracts/sync-sc-dev' into sync…
benceharomi Dec 18, 2023
43740af
chore: removed process.ts
benceharomi Dec 18, 2023
ec5df7a
chore: added era_test_node.log to gitignore
benceharomi Dec 18, 2023
029c775
sync with main (#116)
benceharomi Dec 19, 2023
06ac6b4
Revert "sync with main (#116)" (#117)
benceharomi Dec 19, 2023
981b53f
Merge pull request #118 from matter-labs/sync-dev-with-main
StanislavBreadless Dec 19, 2023
29dde24
Merge branch 'dev' into sync-dev-with-sc-dev
benceharomi Dec 20, 2023
81d7692
ci: system-contracts-ci removed not needed caches
benceharomi Dec 20, 2023
688106a
Merge pull request #115 from matter-labs/sync-dev-with-sc-dev
StanislavBreadless Dec 20, 2023
b6b1275
AllowList removal upgrade preparation
StanislavBreadless Dec 12, 2023
dcb81ad
sync with main
StanislavBreadless Dec 21, 2023
b5d2c9a
sync with main
StanislavBreadless Dec 21, 2023
b49e00f
remove remnants of the allowlist
StanislavBreadless Dec 21, 2023
eb20335
rename file
StanislavBreadless Dec 21, 2023
7e71210
Update zksolc and ecrecover pricing
StanislavBreadless Dec 12, 2023
bef3537
Merge branch 'dev' into v19-system-contracts
StanislavBreadless Dec 22, 2023
a476a7e
Merge branch 'release-v19-allowlist-removal' into v19-system-contracts
StanislavBreadless Dec 22, 2023
fa45ef1
fix typescript
StanislavBreadless Dec 22, 2023
4b82f71
feat(tests): moved Merkle tests to foundry (#132)
koloz193 Jan 2, 2024
69d3df1
feat(tests): migrated verifier tests to foundry (#134)
koloz193 Jan 2, 2024
9ddf15d
chore(tests): Moved priority queue tests from hardhat to foundry (#135)
mm-zk Jan 3, 2024
ab86cf9
chore(test): Moved transaction validator tests to foundry (#151)
mm-zk Jan 3, 2024
d8d29a0
Merge pull request #133 from matter-labs/release-v19-allowlist-removal
StanislavBreadless Jan 5, 2024
97b86e2
test: unchecked math test (#147)
benceharomi Jan 8, 2024
1848b14
L2EthToken Tests (#152)
neotheprogramist Jan 9, 2024
ec768ca
Merge pull request #161 from matter-labs/main
StanislavBreadless Jan 9, 2024
ca032bf
ci: prepare workflow for release contracts (#163)
otani88 Jan 10, 2024
6250292
ci: prepare workflow for release contracts
otani88 Jan 10, 2024
1831009
Fix lint in the yaml file (#166)
StanislavBreadless Jan 12, 2024
2e65523
Merge pull request #165 from matter-labs/main
StanislavBreadless Jan 12, 2024
4287161
Merge pull request #164 from matter-labs/dev
StanislavBreadless Jan 12, 2024
c9fcd5b
Merge branch 'main' into erc20_base_token
fkrause98 Jan 16, 2024
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.
5 changes: 4 additions & 1 deletion ethereum/.eslintrc → .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
"import/namespace": "off",
"import/no-unresolved": "off",
"import/order": "off"
}
},
"ignorePatterns": [
"**/lib/*"
]
}
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
49 changes: 49 additions & 0 deletions .github/workflows/buld-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build and release

on:
push:
branches:
- "*"

jobs:
build-contracts:
runs-on: ubuntu-latest

steps:
- name: Checkout the repository
uses: actions/checkout@v3

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 18.18.0
cache: yarn

- name: Init
id: init
run: |
yarn
echo "release_tag=$(echo ${GITHUB_REF#refs/heads/})-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

- name: Build contracts
run: |
yarn l1 build
yarn l2 build
yarn sc build

- name: Prepare artifacts
run: |
tar -czvf l1-contracts.tar.gz ./l1-contracts
tar -czvf l2-contracts.tar.gz ./l2-contracts
tar -czvf system-contracts.tar.gz ./system-contracts

- name: Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ steps.init.outputs.release_tag }}
fail_on_unmatched_files: true
body: ""
files: |
l1-contracts.tar.gz
l2-contracts.tar.gz
system-contracts.tar.gz
275 changes: 0 additions & 275 deletions .github/workflows/ci.yml

This file was deleted.

Loading
Loading