Code

Kl/without 1.5.0 merge dev#331

Code

Merged

kelemeno merged 135 commits intodevmatter-labs/era-contracts:devfrom kl/without-1.5.0-merge-devmatter-labs/era-contracts:kl/without-1.5.0-merge-devCopy head branch name to clipboardApr 18, 2024

+2,383-2,338

Commits

Commits on Apr 2, 2024

• Use Governance contract as STM owner

  ly0va

  committed
  587fc6f

Commits on Apr 3, 2024

• Fix deploy script with undefined chainId

  ly0va

  committed
  56cfe4b

• updating hyperchain migration tests

  kelemeno

  committed
  08fcdc3

• updating hyperchain migration tests

  kelemeno

  committed
  fed442f

• modifying hyperchain upgrade

  kelemeno

  committed
  a975413

• creating script for hyperchain upgrade

  kelemeno

  committed
  1cc2c80

• updated upgrade scripts

  kelemeno

  committed
  5eaf3fa

• zk fmt

  kelemeno

  committed
  89ebe8e

• contracts era chain id fix

  kelemeno

  committed
  5cf9582

• zk fmt and linting

  kelemeno

  committed
  34a9cd5

• small fix in deploy script

  kelemeno

  committed
  5a32908

• genesis protocol version from latest p v

  kelemeno

  committed
  a21571b

• updated upgrade tests

  kelemeno

  committed
  30f8956

• Ownable2StepUpgradeable

  kelemeno

  committed
  4befd8a

• fixed typo

  kelemeno

  committed
  c6be4c7

• fixed "changeFeeParams" function

  kelemeno

  committed
  445bcf7

• setValidium mode based on storedBatchHashes

  kelemeno

  committed
  cff36f9

• Fix PR review

  

  vladbochok

  authored and

  kelemeno

  committed
  8f4c5b0

• fixed currentPendingAdmin log error

  kelemeno

  committed
  ee5ca89

• new events

  kelemeno

  committed
  021b1c0

• gas cost fixes

  kelemeno

  committed
  38147a6

• zk lint

  kelemeno

  committed
  ee7bd5a

• changed STM -> DP functions

  kelemeno

  committed
  db1130f

• zk fmt

  kelemeno

  committed
  78d4951

• Address review

  

  vladbochok

  authored and

  kelemeno

  committed
  622a801

• Fix review

  

  vladbochok

  authored and

  kelemeno

  committed
  df9f325

• added onlyOwner

  kelemeno

  committed
  488d15b

• validation issues, OZ L04

  kelemeno

  committed
  bc02bed

• zk fmt

  kelemeno

  committed
  0b93956

• fixed tests

  kelemeno

  committed
  8a5de19

• Address review

  

  vladbochok

  authored and

  kelemeno

  committed
  207d195

• fixed require statement and error message

  kelemeno

  committed
  ceb100f

• lint

  kelemeno

  committed
  094f57f

• Fix L-06

  

  vladbochok

  authored and

  kelemeno

  committed
  bd9e94d

• add extra comments in STM

  kelemeno

  committed
  a5dfc6a

• Fix N-02

  

  vladbochok

  authored and

  kelemeno

  committed
  bbbe9e9

• lints

  

  vladbochok

  authored and

  kelemeno

  committed
  24c8be7

• Fix test

  

  vladbochok

  authored and

  kelemeno

  committed
  f360d0e

• Update l1-contracts/contracts/state-transition/StateTransitionManager.sol

  

  StanislavBreadless

  authored and

  kelemeno

  committed
  af562bd

• Fix N-03

  

  vladbochok

  authored and

  kelemeno

  committed
  3f92673

• remove redundancy

  

  StanislavBreadless

  authored and

  kelemeno

  committed
  ca34c4b

• fix lint

  

  StanislavBreadless

  authored and

  kelemeno

  committed
  ca524ce

• fix casting bridges

  

  StanislavBreadless

  authored and

  kelemeno

  committed
  8cd5184

• added new doc strings

  kelemeno

  committed
  3998cad

• zk lint

  kelemeno

  committed
  88e3c7c

• fix typographical errors

  

  Raid Ateir

  authored and

  kelemeno

  committed
  60cf175

• add named parameters and improve descriptions

  

  Raid Ateir

  authored and

  kelemeno

  committed
  39abd6c

• zk lint

  kelemeno

  committed
  b2ea1b5

• add indexed params for validator timelock events

  

  Raid Ateir

  authored and

  kelemeno

  committed
  72a49c6

• Fix tests

  

  vladbochok

  authored and

  kelemeno

  committed
  882e4e7

• renaming n09

  kelemeno

  committed
  42bacf9

• some naming issues

  kelemeno

  committed
  ced6472

• removed payable

  kelemeno

  committed
  a1bd4cc

• removed payable from interface

  kelemeno

  committed
  0c3e2d2

• renamed StateTransition to Hyperchain

  kelemeno

  committed
  4dc74b8

• renaming revert messages

  kelemeno

  committed
  4ba6bcf

• Update l1-contracts/contracts/state-transition/StateTransitionManager.sol

  Show description for 46f85d4
  

  kelemeno

  and

  StanislavBreadless

  committed
  46f85d4

• zk fmt

  

  vladbochok

  authored and

  kelemeno

  committed
  d66e55f

• fixing tests

  kelemeno

  committed
  2194747

• added new SharedBridgeTest file

  kelemeno

  committed
  15293e4

Commits on Apr 5, 2024

• move nonce to correct location

  juan518munoz

  committed
  a19cd47

• Merge pull request #319 from lambdaclass/without-1.5.0-fix-nonce

  Show description for dc4d1b6
  kelemeno

  authored
  dc4d1b6

Commits on Apr 8, 2024

• small renaming

  kelemeno

  committed
  6aef3b7

• missing import added back

  benceharomi

  committed
  3be4efc

• move eraSetFirstUpgradeBatch to its own function

  kelemeno

  committed
  efb9af3

• Merge branch 'dev' of ssh://github.com/matter-labs/era-contracts into kl/without-1.5.0-merge-dev

  kelemeno

  committed
  b7b61ef

• fix test

  kelemeno

  committed
  a30ecb6

• merging differences, tests

  kelemeno

  committed
  b5d7fc5

• kelemeno -> zksync-sdk

  

  ly0va

  authored and

  kelemeno

  committed
  98ee7e5

• Fix utils

  

  ly0va

  authored and

  kelemeno

  committed
  5eb45d2

• Fix config path

  

  ly0va

  authored and

  kelemeno

  committed
  38c1237

• fix(deploy-test-process): CONTRACTS_ERA_CHAIN_ID set to 270

  

  benceharomi

  authored and

  kelemeno

  committed
  27e3ba8

• deploy-preimages fix: zksync-web3 added back

  

  benceharomi

  authored and

  kelemeno

  committed
  7de6499

• small chainId changes

  kelemeno

  committed
  d70e5e0

• config change back

  kelemeno

  committed
  97f2a83

• zk fmt

  kelemeno

  committed
  964c1d0

Commits on Apr 9, 2024

• linting

  kelemeno

  committed
  affa83d

• small import change

  kelemeno

  committed
  45ee4ae

• zk fmt

  kelemeno

  committed
  4844258

• test fix

  kelemeno

  committed
  d023451

• zk lint

  kelemeno

  committed
  bc40ba2

• renaming file

  kelemeno

  committed
  742c131

• Merge branch 'dev' of ssh://github.com/matter-labs/era-contracts into kl/without-1.5.0-merge-dev

  kelemeno

  committed
  bf2a357

• small fixes

  kelemeno

  committed
  e78c5c3

• l2-contracts deploy utils

  kelemeno

  committed
  76cd777

• zk lint

  kelemeno

  committed
  17daf4a

• system contract fix attempt 1

  kelemeno

  committed
  8c4e10a

• zk fmt

  kelemeno

  committed
  434ef23

• system contract fix attempt 2

  kelemeno

  committed
  f4e562a

• added output

  kelemeno

  committed
  2d54bcd

• package.json attempt

  kelemeno

  committed
  91b657d

• attempt 4

  kelemeno

  committed
  9026685

• linting

  kelemeno

  committed
  52d2d46

• yarn update

  kelemeno

  committed
  6770c0b

• small fix

  kelemeno

  committed
  f403e23

• fixes based for Bence's comments

  kelemeno

  committed
  ee2717b

• small contract fixes, added extra script

  kelemeno

  committed
  c43cf97

Commits on Apr 10, 2024

• Vlad and Stas issues

  kelemeno

  committed
  96c9814

• state transition hyperchain renaming

  kelemeno

  committed
  9a1d6a1

• Merge branch 'dev' of ssh://github.com/matter-labs/era-contracts into kl/without-1.5.0-merge-dev

  kelemeno

  committed
  1b42052

• oz upgradable contracts submodule

  kelemeno

  committed
  1fd4cd8

• attempt remove from foundry.toml

  kelemeno

  committed
  6c82491

• address alias helper cleanup

  kelemeno

  committed
  ae16bd5

• Merge branch 'dev' into kl/without-1.5.0-merge-dev

  Deniallugo

  authored
  2e21950

• forge install: openzeppelin-contracts-upgradeable

  Show description for 27fc259
  Deniallugo

  committed
  27fc259

• Fix foundry scripts

  Show description for f33e767
  Deniallugo

  committed
  f33e767

• slither

  kelemeno

  committed
  c706d00

• slither

  kelemeno

  committed
  4b3ea16

Commits on Apr 11, 2024

• Merge branch 'dev' into kl/without-1.5.0-merge-dev

  Deniallugo

  authored
  95e5571

• upgrade fix

  kelemeno

  committed
  032427b

Commits on Apr 12, 2024

• spellcheck

  kelemeno

  committed
  6ca20c6

• Merge branch 'dev' of ssh://github.com/matter-labs/era-contracts into kl/without-1.5.0-merge-dev

  kelemeno

  committed
  40d0f60

• small contract fixes

  kelemeno

  committed
  c88cb6f

• zk fmt && zk lint

  kelemeno

  committed
  80d3067

• fix C4 issue related to claimFailedDeposits

  kelemeno

  committed
  6a9a0d0

• fixes, linting

  kelemeno

  committed
  da97cae

• Merge branch 'dev' of ssh://github.com/matter-labs/era-contracts into kl/without-1.5.0-merge-dev

  kelemeno

  committed
  dab2a1f

• cleaned up hyperchain-upgrade test a bit,

  Show description for d32f4a3
  kelemeno

  committed
  d32f4a3

• rename and add to interface

  kelemeno

  committed
  8656a58

• fixed comparison error

  kelemeno

  committed
  a2f0167

• better name

  kelemeno

  committed
  6f8ae38

• changed the names a bit

  kelemeno

  committed
  f168e54

• finalizeWithdrawal check eraPostUpgradeFirstBatch

  Show description for a60710d
  kelemeno

  committed
  a60710d

• last deposit time edge case

  kelemeno

  committed
  53a0a21

• removed wrong check (tx number = 0 is allowed)

  kelemeno

  committed
  5e033da

Commits on Apr 13, 2024

• separate eth and token withdrawal batch number

  kelemeno

  committed
  857eada

• cleanup

  kelemeno

  committed
  95da499

Commits on Apr 15, 2024

• more migration testing

  kelemeno

  committed
  76acbf5

Commits on Apr 16, 2024

• small typo fix

  kelemeno

  committed
  a997ae6

• tokenProxyBytecodeHash now only

  Show description for 77d1cc8
  kelemeno

  committed
  77d1cc8

• Merge branch 'dev' of ssh://github.com/matter-labs/era-contracts into kl/without-1.5.0-merge-dev

  kelemeno

  committed
  77ec2bb

• extra comments

  kelemeno

  committed
  74311c2

Commits on Apr 18, 2024

• yarn update

  kelemeno

  committed
  bb39921

• revert yarn update

  kelemeno

  committed
  abe934f

• chore(scripts): Get Scripts Working in CI (#376)

  koloz193

  authored
  90c869e