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

Problem: sync upstream repo to v18.13.0 #8

Open
wants to merge 79 commits into
base: main
Choose a base branch
from

Commits on Feb 15, 2023

  1. A new era

    but because it’s a credibly neutral mechanism
    shahar4 committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    6336955 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Logo + disclaimer.

    shahar4 committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    4150422 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Configuration menu
    Copy the full SHA
    e41215e View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Merge pull request #4 from matter-labs/secrets_monitoring

    chore(security): add workflow for leaked secrets monitoring
    otani88 authored Feb 21, 2023
    Configuration menu
    Copy the full SHA
    5a6c728 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Update README.md

    shahar4 authored Mar 8, 2023
    Configuration menu
    Copy the full SHA
    eb25eaa View commit details
    Browse the repository at this point in the history
  2. Remove Apache license.

    shahar4 committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    02a703e View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Updating to latest in dev.

    shahar4 committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    ab2cba3 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Fair Onboarding Alpha.

    shahar4 committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    857da71 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Add comment on EIP-1352

    pcaversaccio authored Mar 30, 2023
    Configuration menu
    Copy the full SHA
    e73b7b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Merge pull request #5 from pcaversaccio/patch-1

    Add comment on `MAX_SYSTEM_CONTRACT_ADDRESS` choice
    popzxc authored Apr 21, 2023
    Configuration menu
    Copy the full SHA
    4e0487b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Updating mirror

    shahar4 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    f083d87 View commit details
    Browse the repository at this point in the history
  2. Updating mirror.

    shahar4 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    28dbd2d View commit details
    Browse the repository at this point in the history
  3. Update README.md

    shahar4 authored May 31, 2023
    Configuration menu
    Copy the full SHA
    7658f9a View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Updating mirror.

    Used 663fede669db3ba66f0941985db304e8bca881e4.
    shahar4 committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    ae905bd View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. mirror sync to 7381458849b42

    mm-zk authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    de72432 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af730ec View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    66899a6 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Configuration menu
    Copy the full SHA
    87381ab View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Add FOS Templates (#15)

    shahar4 authored Sep 18, 2023
    Configuration menu
    Copy the full SHA
    9826aa2 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Configuration menu
    Copy the full SHA
    848eb19 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Configuration menu
    Copy the full SHA
    3e954a6 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Syncing dev with main (#26)

    Co-authored-by: Marcin M <[email protected]>
    Co-authored-by: Dennis <[email protected]>
    Co-authored-by: Shahar Kaminsky <[email protected]>
    Co-authored-by: Yury Akudovich <[email protected]>
    5 people authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    b6286ef View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Boojum integration (#35)

    Co-authored-by: Marcin M <[email protected]>
    Co-authored-by: Dennis <[email protected]>
    Co-authored-by: Shahar Kaminsky <[email protected]>
    Co-authored-by: Vlad Bochok <[email protected]>
    Co-authored-by: koloz193 <[email protected]>
    Co-authored-by: AntonD3 <[email protected]>
    7 people authored Oct 4, 2023
    Configuration menu
    Copy the full SHA
    ef5e5f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Configuration menu
    Copy the full SHA
    ba9835a View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Configuration menu
    Copy the full SHA
    0444347 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. feat: testing CI job (#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
    benceharomi authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    ed2420a View commit details
    Browse the repository at this point in the history
  2. 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
    mm-zk authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    1d18d2e View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. feat: linting CI job (#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
    benceharomi authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    efc9637 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. feat: calculate-hashes command to detect contract changes (#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
    benceharomi authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    08d54d5 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. feat: use boojum-integration branch of in-memory node for testing CI …

    …(#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 authored Oct 20, 2023
    Configuration menu
    Copy the full SHA
    0d38b70 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. ci: use era-test-node-action for the testing CI (#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
    benceharomi authored Oct 27, 2023
    Configuration menu
    Copy the full SHA
    68aaee1 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. updated hh version and solidity version (#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
    koloz193 authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    6ce4f8f View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Set of fixes for boojum integration (#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 <[email protected]>
    
    * update max precompile address constant
    
    * Only the deployer can increment the deployment nonce
    
    * fix lint
    
    * add some tests
    
    ---------
    
    Co-authored-by: Vlad Bochok <[email protected]>
    StanislavBreadless and vladbochok authored Nov 1, 2023
    Configuration menu
    Copy the full SHA
    8a4349e View commit details
    Browse the repository at this point in the history
  2. sync with main

    StanislavBreadless committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    6a84bef View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. chore: synchronise linting rules of repositories (#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  (#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.
    benceharomi authored Nov 2, 2023
    Configuration menu
    Copy the full SHA
    27d550a View commit details
    Browse the repository at this point in the history
  2. sync with dev

    StanislavBreadless committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    6c8a46a View commit details
    Browse the repository at this point in the history
  3. fix hardhat

    StanislavBreadless committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    6faac62 View commit details
    Browse the repository at this point in the history
  4. fmt

    StanislavBreadless committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    1395b99 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    db5bbad View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Allow ts-ignore (#59)

    allow ts ignore
    StanislavBreadless authored Nov 3, 2023
    Configuration menu
    Copy the full SHA
    97208b7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    18ab544 View commit details
    Browse the repository at this point in the history
  3. update hashes

    StanislavBreadless committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    eab158c View commit details
    Browse the repository at this point in the history
  4. update hashes

    StanislavBreadless committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    38ea20e View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

  1. Configuration menu
    Copy the full SHA
    8f09d7b View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Use compatible error codes with the previous version (#64)

    * use compatible error codes with the previous version
    
    * update hashes
    StanislavBreadless authored Nov 6, 2023
    Configuration menu
    Copy the full SHA
    3377d27 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Merge pull request #88 from matter-labs/main

    Syncing dev with main
    StanislavBreadless authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    1550e75 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #65 from matter-labs/main

    Syncing dev with main
    StanislavBreadless authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    5227006 View commit details
    Browse the repository at this point in the history
  3. chore: normalise file path (#18)

    refactor: normalize file path
    
    Co-authored-by: Bence Haromi <[email protected]>
    ylmin and benceharomi authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a604944 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8806c1a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    010786f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6619454 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #90 from matter-labs/dev

    Syncing main with dev
    StanislavBreadless authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    9c85f58 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3f44c2a View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. docs(readme): update zksync-era link (#48)

    docs: update docs
    DKlupov authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    96d10b2 View commit details
    Browse the repository at this point in the history
  2. docs: add Mirror link (#51)

    feat(docs): Add Mirror hyperlink
    Saladerl authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    ef9f578 View commit details
    Browse the repository at this point in the history
  3. docs: fix Discord link (#55)

    Update README.md - Fix Discord Link
    
    Co-authored-by: Bence Haromi <[email protected]>
    MartinKong1990 and benceharomi authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    0e5b789 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Configuration menu
    Copy the full SHA
    5b38a57 View commit details
    Browse the repository at this point in the history
  2. docs: zk credo added

    benceharomi committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    920e2e5 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. docs: readme updates (#94)

    Co-authored-by: Bill <[email protected]>
    benceharomi and leonterms authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    374a720 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #67 from matter-labs/readme-updates

    docs: readme updates
    StanislavBreadless authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    408dffd View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. correct todo

    StanislavBreadless committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    1cbcb62 View commit details
    Browse the repository at this point in the history
  2. fix lint

    StanislavBreadless committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    aa02d54 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    61c11f6 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. fix system context

    StanislavBreadless committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    e1578dd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fe52dbe View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ef4c3db View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ff74528 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #71 from matter-labs/sb-prepare-upgrade

    Prepare tooling for the upgrade
    StanislavBreadless authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    a00ab9a View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Configuration menu
    Copy the full SHA
    2491d56 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #66 from matter-labs/bh-evm-388-add-workflow-to-la…

    …bel-external-contributions
    
    ci: add workflow to label external-contributions
    StanislavBreadless authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    d42f707 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Configuration menu
    Copy the full SHA
    156071a View commit details
    Browse the repository at this point in the history
  2. Merge branch 'bh-evm-298-merge-contracts-and-system-contracts-repos' …

    …of github.com:matter-labs/era-system-contracts
    benceharomi committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    986cafd View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Configuration menu
    Copy the full SHA
    3e2bee9 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Configuration menu
    Copy the full SHA
    a8429e8 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Scripts for governance (#92)

    Co-authored-by: Vlad Bochok <[email protected]>
    StanislavBreadless and vladbochok authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    a20a2e5 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. chore: merge contracts and system-contracts repos (#98)

    Co-authored-by: Stanislav Bezkorovainyi <[email protected]>
    Co-authored-by: Vlad Bochok <[email protected]>
    3 people authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    e77971d View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/main' into bh-evm-298-merge-sc

    # Conflicts:
    #	l1-contracts/scripts/migrate-governance.ts
    #	l2-contracts/src/upgradeL2BridgeImpl.ts
    #	l2-contracts/src/utils.ts
    benceharomi committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    5445270 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    28b399e View commit details
    Browse the repository at this point in the history
  4. Merge pull request #114 from matter-labs/bh-evm-298-merge-sc

    chore: merge contracts and system-contracts repos
    StanislavBreadless authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    87cd8d7 View commit details
    Browse the repository at this point in the history