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 #114

Merged
merged 68 commits into from
Dec 18, 2023

Conversation

benceharomi
Copy link
Contributor

@benceharomi benceharomi commented Dec 18, 2023

This PR contains:

shahar4 and others added 30 commits February 15, 2023 10:01
but because it’s a credibly neutral mechanism
chore(security): add workflow for leaked secrets monitoring
Add comment on `MAX_SYSTEM_CONTRACT_ADDRESS` choice
Used 663fede669db3ba66f0941985db304e8bca881e4.
Co-authored-by: Marcin M <128217157+mm-zk@users.noreply.github.com>
Co-authored-by: Dennis <10233439+idea404@users.noreply.github.com>
Co-authored-by: Shahar Kaminsky <sk@matterlabs.dev>
Co-authored-by: Yury Akudovich <ya@matterlabs.dev>
Co-authored-by: Marcin M <128217157+mm-zk@users.noreply.github.com>
Co-authored-by: Dennis <10233439+idea404@users.noreply.github.com>
Co-authored-by: Shahar Kaminsky <sk@matterlabs.dev>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
Co-authored-by: koloz193 <zach.kolodny@gmail.com>
Co-authored-by: AntonD3 <74021421+AntonD3@users.noreply.github.com>
* ci: testing added

* test: temporarily commenting out failing tests

* ci: cleaned up + added testing

* fix: CI syntax

* ci: added missing "needs" statement

* ci: added missing node-setup

* ci: added missing artifacts for cacheing

* test: xdescribe and xit instead of commenting

* chore: formatting
* added missing file to mirror  de404a390af2aa37ad (#12)

* POC - works

* test infra creation

* splitting tracers to separate files

* moved hooks to separate file

* larger refactor - nicer error messages

* syncing with newest version

* more bootloader tests and small error fixes

* more tests

* Example with transaction

* small fixes

* small rename

* review and removed dependency on ZKSYNC_HOME

* cargo lock

* updated to public zksync-era

* moved the placeholder so that the generated bootloader code doesn't change

* review

* fix yarn lock

* compiles (currently depending on a local branch)

* remove vscode config

* added bootloader test to CI

* changing CI

* experimenting

* fix

* review feedback

* ci typo

* added bootloader build to cache
* feat: linting

* chore: PR template updated

* fix: import order

* lint: solidity compiler-version 0.8.0

* lint: solidity lint config updated to ignore constructors

* docs(readme): updated

* lint(*.ts): fixes

* fix: accidental change

* chore: include js files in formatting

* chore: change command name back to compile-yul

* chore: typescript rollback

* ci: test_bootloader needs linting

* lint: new files linted

* chore(0.json): code formatting

* chore: unneeded prettierignore

* docs(bootloader-test): updated to use new command

* chore: test:bootloader

* lint: markdown linting added

* chore: downgraded markdownlint to avoid dependency with unwanted license

* chore: lint:fix command added

* docs: lint fix added PR template

* lint: reverted formatting of openzeppelin contracts

* fix: yarn command fixes

* lint: openzeppelin dir ignored from formatting/linting

* lint: newline at EOF of ignore files
* feat: calculate-hashes

* fix: build-yul command updated

* chore: CI workflow renamed

* feat(calculate-hashes): "--check-only" flag added

* ci: calculate-hashes added to pipeline

* modifying hash to test calculate-hashes in CI

* Revert "modifying hash to test calculate-hashes in CI"

This reverts commit 639650b3dfb4fcc7f64e75f316aa6262976c4c3f.

* chore: bytecodeHash renamed

* chore: importing and typo

* feat: revert command renames

* chore: major calculate-hashes refactor

* ci: check hashes into separate job

* ci: yarn cacheing

* fix: absolutePath

* fix: hash updated

* fix: SHA256 hash updated

* docs: readme updated

* chore: changed hashes to array

* chore: SystemContractsHashes updated

* lint(calculate-hashes): format+lint

* docs: command name typo

* fix: calculate hashes updated

* chore: automatic contracts details generation

* chore: changed the order of json properties
…43)

* ci: using boojum branch of test node

* test: reenable temporarily disabled tests

* ci: test node in background

* ci: caching for era-test-node

* chore: downgrading hardhat version to fix test execution

* ci: ci to run on dev and main push

* chore: set hardhat to fix v2.16.0

* ci: print era_test_node logs

* ci: change tag to commit SHA of dependency
@benceharomi benceharomi changed the title chore: merging system contracts chore: merge contracts and system-contracts repos Dec 18, 2023
Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
@benceharomi benceharomi marked this pull request as draft December 18, 2023 10:05
@benceharomi benceharomi marked this pull request as ready for review December 18, 2023 10:05
@benceharomi benceharomi reopened this Dec 18, 2023
@benceharomi benceharomi changed the base branch from main to dev December 18, 2023 10:11
@benceharomi benceharomi changed the base branch from dev to main December 18, 2023 10:11
# Conflicts:
#	l1-contracts/scripts/migrate-governance.ts
#	l2-contracts/src/upgradeL2BridgeImpl.ts
#	l2-contracts/src/utils.ts
@StanislavBreadless StanislavBreadless merged commit 87cd8d7 into main Dec 18, 2023
16 checks passed
@StanislavBreadless StanislavBreadless deleted the bh-evm-298-merge-sc branch December 18, 2023 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.