Merge main into erc20 base token (#9)

* A new era

but because it’s a credibly neutral mechanism

* Logo + disclaimer.

* chore(security): add workflow for leaked secrets monitoring

* Update README.md

* Remove Apache license.

* Updating to latest in dev.

* Fair Onboarding Alpha.

* Add comment on EIP-1352

* Updating mirror

* Updating mirror.

* Update README.md

* Updating mirror.

Used 663fede669db3ba66f0941985db304e8bca881e4.

* mirror sync to 7381458849b42

* Mirror to de404a390af2aa37ad23b2a543c5f1b408ca84bf (#11)

* added missing file to mirror  de404a390af2aa37ad (#12)

* fix: bump hh deploy and solc versions (#13)

* Add FOS Templates (#15)

* chore: Syncs common workflows from the template into dev (#16)

* chore: Syncs common workflows from the template into main (#17)

* Syncing dev with main (matter-labs#26)

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>

* Boojum integration (matter-labs#35)

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>

* chore: Upgrade to Node v18 (#20)

* feat: Adding compile CI (#21)

* feat: testing CI job (matter-labs#38)

* 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

* Testing framework for bootloader (#14)

* 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 CI job (matter-labs#40)

* 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 command to detect contract changes (matter-labs#37)

* 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

* feat: use boojum-integration branch of in-memory node for testing CI (matter-labs#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

* ci: use era-test-node-action for the testing CI (matter-labs#50)

* ci: using era-test-node-action

* ci: use boojum release of era-test-node

* ci: releaseTag fix

* ci: fix releaseTag

* ci: era-test-node-action v0.1.3

* updated hh version and solidity version (matter-labs#52)

* updated hh version and solidity version

* removed carrot

* formatting

* fixed compiler versions

* updated yul compiler version

* update hash file

* changed OZ contracts back

* update hash file

* changed compiler version

* bumped utils compiler version and hashes

* Set of fixes for boojum integration (matter-labs#53)

* apply max system contracts address

* add comment

* Allow only deployments for L1->L2

* fail to publish timesstamp

* remove trailing comma

* correct require for L1Messenger

* fix eip1559

* charge correctly for the memory overhead

* check that we have enough gas for postop

* fix comment in L1Messenger

* remove redundant check

* safeAdd for refunds

* compilation fixes + EOA work correctly on delegatecall

* correctly charge for gas overhead

* ensure that upgrade tx always succeeds

* add force deploy for keccak256

* max precompile address fix

* correct refund gas for L1 gas

* fix shifting

* correct meta calculation

* nits

* prev hash

* fix some nits

* remove unneeded casting

* fix lint

* update hashes

* update hashes

* Update bootloader/bootloader.yul

Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

* update max precompile address constant

* Only the deployer can increment the deployment nonce

* fix lint

* add some tests

---------

Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

* chore: synchronise linting rules of repositories (matter-labs#49)

* chore: command name changes

* lint(calculate-hashes): fix

* fix: lint:md command

* chore: package.json commands alphabetical order

* lint: using @matterlabs/eslint-config-typescript and "@matterlabs/prettier-config

* style: prettier:fix

* lint: lint:fix

* Revert "lint: lint:fix"

This reverts commit 15993b2d2ddfce0d876966d170e781645ff66cf9.

* lint: eslint rules turned off

* lint: lint:fix with new rules

* chore: .eslintignore removed

* chore: create githooks to check formatting and linting  (matter-labs#56)

* chore: pre-commit and pre-push hooks added

* docs: removed yarn lint from PR template

* Revert "chore: package.json commands alphabetical order"

This reverts commit e39a52c0b764a6ef40cfdc0fded9e068cceba1ce.

* fix hardhat

* fmt

* ignore invalid field

* Allow ts-ignore (matter-labs#59)

allow ts ignore

* nits + use the same config as on L1

* update hashes

* update hashes

* Use compatible error codes with the previous version (matter-labs#64)

* use compatible error codes with the previous version

* update hashes

* chore: normalise file path (#18)

refactor: normalize file path

Co-authored-by: Bence Haromi <56651250+benceharomi@users.noreply.github.com>

* ci: label-external-contributions workflow added

* ci: extension changed to yaml

* make scripts work for upgrade

* docs(readme): update zksync-era link (matter-labs#48)

docs: update docs

* docs: add Mirror link (matter-labs#51)

feat(docs): Add Mirror hyperlink

* docs: fix Discord link (matter-labs#55)

Update README.md - Fix Discord Link

Co-authored-by: Bence Haromi <56651250+benceharomi@users.noreply.github.com>

* docs: zk credo added

* remove admin and use governance owner as admin instead (matter-labs#85)

* correct todo

* fix lint

* fix system context

* upd bootloader hash

* ci: add workflow to label external-contributions (matter-labs#91)

* chore: moved files into system folder

* Remove allow list (matter-labs#77)

Co-authored-by: Stanislav Breadless <stanislavbezkor@gmail.com>

* Upgrade zksolc version to 1.3.17 (matter-labs#97)

* Fix bridge upgrade script (matter-labs#103)

* Disallow L2 weth upgrade (matter-labs#107)

* Testing infrastructure improvements (matter-labs#82)

* System contracts test preprocessing mode

* Mock dependencies, event writer asm contract test, refactoring

* lint fix

* Small refactoring

* Change approach to use the test node

* Add docs, comments

* lint readme

* Fix hashes

* Regenerate yarn.lock to fix lints

* lint:fix

* Fix lints

* Restore lost tests

* Fix lints

* Restore yarn.lock from dev

* Update caches in workflows

* Try to disable lint cache

* Restore lint cache

* Cache contracts-preprocessed

* try to debug lint

* Regenerate yarn.lock from dev

* Restore correct deps

* Update lock

* Proposed improvements/fixes

* Use fast-glob instead glob

* Update bootloader_test artifact path

* Proposed improvements, update hashes

* Implement some fixes and improvements

* Fix lints

* Update zksync-era in bootloader tests

* Fix imports

Signed-off-by: Danil <deniallugo@gmail.com>

* Update contracts/test-contracts/MockContract.sol

Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

* Fix test infra

* data -> input mock contract

* Update SC hashes

* Update zksync-era in bootloader/test_infra

* Update again

---------

Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Danil <deniallugo@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

* Scripts for governance (matter-labs#92)

Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

* chore: merge contracts and system-contracts repos (matter-labs#98)

Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

* chore: fixed migrate-governance file path

* chore: removed process.ts

* chore: added era_test_node.log to gitignore

* sync with main (matter-labs#116)

Co-authored-by: Shahar Kaminsky <sk@matterlabs.dev>
Co-authored-by: Maksym <maksym.kryva@gmail.com>
Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
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: Yury Akudovich <ya@matterlabs.dev>
Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com>
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>
Co-authored-by: Jack <87960263+ylmin@users.noreply.github.com>
Co-authored-by: DKlupov <148810781+DKlupov@users.noreply.github.com>
Co-authored-by: Salad <148864073+Saladerl@users.noreply.github.com>
Co-authored-by: MartinKong1990 <104483650+MartinKong1990@users.noreply.github.com>

* Revert "sync with main (matter-labs#116)" (matter-labs#117)

* ci: system-contracts-ci removed not needed caches

* AllowList removal upgrade preparation

* remove remnants of the allowlist

* rename file

* Update zksolc and ecrecover pricing

* fix typescript

* feat(tests): moved Merkle tests to foundry (matter-labs#132)

* feat(tests): migrated verifier tests to foundry (matter-labs#134)

* chore(tests): Moved priority queue tests from hardhat to foundry (matter-labs#135)

* chore(test): Moved transaction validator tests to foundry (matter-labs#151)

* test: unchecked math test (matter-labs#147)

* L2EthToken Tests (matter-labs#152)

Co-authored-by: Uacias <filgum0326@gmail.com>

* ci: prepare workflow for release contracts (matter-labs#163)

* ci: prepare workflow for release contracts

* Fix lint in the yaml file (matter-labs#166)

---------

Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Shahar Kaminsky <sk@matterlabs.dev>
Co-authored-by: Maksym <maksym.kryva@gmail.com>
Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Co-authored-by: Igor Aleksanov <popzxc@yandex.ru>
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: Yury Akudovich <ya@matterlabs.dev>
Co-authored-by: Bence Haromi <56651250+benceharomi@users.noreply.github.com>
Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com>
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>
Co-authored-by: Jack <87960263+ylmin@users.noreply.github.com>
Co-authored-by: Bence Haromi <bence.haromi@gmail.com>
Co-authored-by: DKlupov <148810781+DKlupov@users.noreply.github.com>
Co-authored-by: Salad <148864073+Saladerl@users.noreply.github.com>
Co-authored-by: MartinKong1990 <104483650+MartinKong1990@users.noreply.github.com>
Co-authored-by: Thomas Nguy <81727899+thomas-nguy@users.noreply.github.com>
Co-authored-by: Danil <deniallugo@gmail.com>
Co-authored-by: Neo <128649481+neotheprogramist@users.noreply.github.com>
Co-authored-by: Uacias <filgum0326@gmail.com>

ethereum/.eslintrc → .eslintrc

@@ -8,5 +8,8 @@
     "import/namespace": "off",
     "import/no-unresolved": "off",
     "import/order": "off"
-  }
+  },
+  "ignorePatterns": [
+    "**/lib/*"
+  ]
 }

.githooks/pre-commit

@@ -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

.githooks/pre-push

@@ -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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,9 @@
 ---
 name: Feature request
 about: Use this template for requesting features
-title: ''
+title: ""
 labels: feat
-assignees: ''
+assignees: ""
 ---
 
 ### 🌟 Feature Request

.github/workflows/buld-release.yaml

@@ -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