Code

feat!: boojum integration#112

Code

Merged

mm-zk merged 144 commits intomainmatter-labs/zksync-era:mainfrom boojum-integrationmatter-labs/zksync-era:boojum-integrationCopy head branch name to clipboardNov 6, 2023

+16,803-3,930

Commits

Commits on Sep 29, 2023

• boojum integration

  StanislavBreadless

  committed
  b2263ee

  Copy full SHA for b2263ee

• change verifier

  StanislavBreadless

  committed
  1ba1b5e

  Copy full SHA for 1ba1b5e

• roll back changes

  StanislavBreadless

  committed
  9557e3e

  Copy full SHA for 9557e3e

Commits on Oct 1, 2023

• fix issues with detecting upgrades

  StanislavBreadless

  committed
  6bfa1bf

  Copy full SHA for 6bfa1bf

Commits on Oct 2, 2023

• fix CI

  StanislavBreadless

  committed
  14268ba

  Copy full SHA for 14268ba

• Merge pull request #141 from matter-labs/sb-fix-boojum-integration

  Show description for 83ac4cf
  StanislavBreadless

  authored
  83ac4cf

  Copy full SHA for 83ac4cf

Commits on Oct 4, 2023

• chore(ci): Fixing CI (#150)

  Show description for 3930c5d
  mm-zk

  authored
  3930c5d

  Copy full SHA for 3930c5d

• feat(prover): Witness change for snark wrapper, updated keys (#151)

  Show description for 2a5c072
  mm-zk

  authored
  2a5c072

  Copy full SHA for 2a5c072

• feat(boojum): Adding zk status prover command (#128)

  Show description for d4f292b
  mm-zk

  authored
  d4f292b

  Copy full SHA for d4f292b

• fix(boojum): Don't pass aggregation_results as recursive aggregation inputs (#157)

  Show description for 1625ec2
  mm-zk

  authored
  1625ec2

  Copy full SHA for 1625ec2

Commits on Oct 5, 2023

• feat(boojum): added flag to control prover selection at genesis (#158)

  Show description for 867f2bf
  mm-zk

  authored
  867f2bf

  Copy full SHA for 867f2bf

• fix(prover): Use SNARK wrapper VK for picking prover jobs (#142)

  Show description for 6040e37
  

  ly0va

  and

  StanislavBreadless

  authored
  6040e37

  Copy full SHA for 6040e37

• chore: Bump contracts and system-contracts submodules (#160)

  Show description for 2bc95e9
  ly0va

  authored
  2bc95e9

  Copy full SHA for 2bc95e9

• chore(boojum): Merge main into boojum-integration (#164)

  Show description for 7608e5f
  

  10 peopleauthored
  7608e5f

  Copy full SHA for 7608e5f

• sync with main

  StanislavBreadless

  committed
  16dc31c

  Copy full SHA for 16dc31c

Commits on Oct 6, 2023

• updated fee model for new state diff compression

  koloz193

  committed
  ff0c387

  Copy full SHA for ff0c387

• fixed write size calculation

  koloz193

  committed
  e265187

  Copy full SHA for e265187

• allow if statement comparison

  koloz193

  committed
  ecad4b6

  Copy full SHA for ecad4b6

• update how size is calculated

  koloz193

  committed
  481e417

  Copy full SHA for 481e417

• only charge for difference in bytes if more than already paid

  koloz193

  committed
  1026dd5

  Copy full SHA for 1026dd5

Commits on Oct 9, 2023

• fix(boojum): Fix VK in prover_fri_protocol_versions (#174)

  Show description for 742ec84
  ly0va

  authored
  742ec84

  Copy full SHA for 742ec84

• Merge remote-tracking branch 'origin/main' into lyova-merge-main-into-boojum

  ly0va

  committed
  ab384c2

  Copy full SHA for ab384c2

• Merge pull request #177 from matter-labs/lyova-merge-main-into-boojum

  Show description for d2ca29b
  ly0va

  authored
  d2ca29b

  Copy full SHA for d2ca29b

Commits on Oct 10, 2023

• store initial seen value and compare to that for charging users

  koloz193

  committed
  9b2b576

  Copy full SHA for 9b2b576

• remove unused var

  koloz193

  committed
  f943c03

  Copy full SHA for f943c03

Commits on Oct 11, 2023

• merge main into boojum integration

  StanislavBreadless

  committed
  e9b9ae7

  Copy full SHA for e9b9ae7

• remove accidental prints

  StanislavBreadless

  committed
  35fef5a

  Copy full SHA for 35fef5a

• add logs for debugging

  StanislavBreadless

  committed
  70bc440

  Copy full SHA for 70bc440

• hopefully fix revert test

  StanislavBreadless

  committed
  958cbaf

  Copy full SHA for 958cbaf

• remove helper console logs

  StanislavBreadless

  committed
  548689b

  Copy full SHA for 548689b

• Merge pull request #197 from matter-labs/sb-merge-main-into-boojum-integration

  Show description for c7153bf
  StanislavBreadless

  authored
  c7153bf

  Copy full SHA for c7153bf

• Merge branch 'boojum-integration' into zk-fees-pubdata

  koloz193

  committed
  f56e5ed

  Copy full SHA for f56e5ed

Commits on Oct 12, 2023

• use 1.4.0 in vm crate

  StanislavBreadless

  committed
  5a015c1

  Copy full SHA for 5a015c1

• Merge pull request #203 from matter-labs/sb-integrate-1-4-0

  Show description for 9eefd43
  StanislavBreadless

  authored
  9eefd43

  Copy full SHA for 9eefd43

• Remove some RocksDB code diff

  perekopskiy

  committed
  018a71b

  Copy full SHA for 018a71b

• Run migration till the end when initting

  perekopskiy

  committed
  1d6fda4

  Copy full SHA for 1d6fda4

• Merge pull request #210 from matter-labs/fix-boojum-rocksdb

  Show description for 5e7bc64
  perekopskiy

  authored
  5e7bc64

  Copy full SHA for 5e7bc64

Commits on Oct 16, 2023

• reverted changes to old file

  koloz193

  committed
  3014213

  Copy full SHA for 3014213

• simplified calculation logic

  koloz193

  committed
  616a526

  Copy full SHA for 616a526

• store initial values and check for refund amount based on amount of pubdata required

  koloz193

  committed
  4716fab

  Copy full SHA for 4716fab

Commits on Oct 17, 2023

• use query timestamp

  koloz193

  committed
  b30f9f8

  Copy full SHA for b30f9f8

• sync boojum integration with main

  StanislavBreadless

  committed
  e98780f

  Copy full SHA for e98780f

Commits on Oct 18, 2023

• fix unit tests

  StanislavBreadless

  committed
  894b323

  Copy full SHA for 894b323

• Merge branch 'boojum-integration' into zk-fees-pubdata

  koloz193

  committed
  341d484

  Copy full SHA for 341d484

• use full mode in revert test

  StanislavBreadless

  committed
  6d60703

  Copy full SHA for 6d60703

• remove unneeded print

  StanislavBreadless

  committed
  0ea94d2

  Copy full SHA for 0ea94d2

• fix fee test

  StanislavBreadless

  committed
  2a67ab7

  Copy full SHA for 2a67ab7

• support commitments for next version

  StanislavBreadless

  committed
  4c2d597

  Copy full SHA for 4c2d597

• Merge pull request #253 from matter-labs/sb-merge-main-into-boojum

  Show description for 71ffe99
  ly0va

  authored
  71ffe99

  Copy full SHA for 71ffe99

Commits on Oct 19, 2023

• merge boojum

  koloz193

  committed
  e798ba7

  Copy full SHA for e798ba7

• updated cargo lock and removed duplicate const

  koloz193

  committed
  3da317c

  Copy full SHA for 3da317c

Commits on Oct 20, 2023

• removed unnecessary calls

  koloz193

  committed
  42ab3ae

  Copy full SHA for 42ab3ae

• Merge pull request #168 from matter-labs/zk-fees-pubdata

  Show description for b235187
  koloz193

  authored
  b235187

  Copy full SHA for b235187

Commits on Oct 25, 2023

• Merge remote-tracking branch 'origin/main' into boojum-integration

  ly0va

  committed
  744197a

  Copy full SHA for 744197a

• Remove legacy types and keep only new types

  Show description for 83eb614
  Deniallugo

  committed
  83eb614

  Copy full SHA for 83eb614

• feat: contracts submodules linting commands

  benceharomi

  committed
  2530061

  Copy full SHA for 2530061

• fmt: json, yaml extensions added to prettier

  benceharomi

  committed
  f802bf3

  Copy full SHA for f802bf3

• fmt: json and yaml files formatted

  benceharomi

  committed
  0967ba0

  Copy full SHA for 0967ba0

• lint: sol lint rule update + submodule ignore

  benceharomi

  committed
  db4ff0f

  Copy full SHA for db4ff0f

• Revert "fmt: json and yaml files formatted"

  Show description for 13a15ca
  benceharomi

  committed
  13a15ca

  Copy full SHA for 13a15ca

• Revert "fmt: json, yaml extensions added to prettier"

  Show description for 2639834
  benceharomi

  committed
  2639834

  Copy full SHA for 2639834

• Fix state_keeper tests

  ly0va

  committed
  574cde7

  Copy full SHA for 574cde7

• Fix eth_watch unit tests

  ly0va

  committed
  f071cff

  Copy full SHA for f071cff

Commits on Oct 26, 2023

• Fix empty system logs

  ly0va

  committed
  37fc6bd

  Copy full SHA for 37fc6bd

• updated storage oracle to calculate pubdata bytes correctly

  koloz193

  committed
  12ffbf5

  Copy full SHA for 12ffbf5

• Merge branch 'main' into lyova-merge-main-into-boojum-again

  koloz193

  committed
  3628d62

  Copy full SHA for 3628d62

• resolved merge conflicts

  koloz193

  committed
  f7ac2de

  Copy full SHA for f7ac2de

Commits on Oct 27, 2023

• Fix some lints

  ly0va

  committed
  69c7b9e

  Copy full SHA for 69c7b9e

• remove unused variable

  koloz193

  committed
  af07c50

  Copy full SHA for af07c50

• Fix invalid error log

  ly0va

  committed
  fc0fd77

  Copy full SHA for fc0fd77

Commits on Oct 30, 2023

• Fix more lints

  ly0va

  committed
  5e7cc1c

  Copy full SHA for 5e7cc1c

• Merge remote-tracking branch 'origin/main' into lyova-merge-main-into-boojum-again

  ly0va

  committed
  0cecd94

  Copy full SHA for 0cecd94

• Fix zk compile

  ly0va

  committed
  86655f2

  Copy full SHA for 86655f2

• Bump era-contracts

  ly0va

  committed
  a99026e

  Copy full SHA for a99026e

• Merge pull request #307 from matter-labs/lyova-merge-main-into-boojum-again

  Show description for 830d719
  ly0va

  authored
  830d719

  Copy full SHA for 830d719

Commits on Nov 1, 2023

• sync with latest release

  StanislavBreadless

  committed
  90d3b63

  Copy full SHA for 90d3b63

• update scripts to use the correct facets

  StanislavBreadless

  committed
  1b9feae

  Copy full SHA for 1b9feae

Commits on Nov 2, 2023

• sync boojum integration with main

  StanislavBreadless

  committed
  222ae96

  Copy full SHA for 222ae96

• add initial protocol version

  StanislavBreadless

  committed
  2fb9d43

  Copy full SHA for 2fb9d43

• upd unit tests

  StanislavBreadless

  committed
  293cc9d

  Copy full SHA for 293cc9d

• fix ext node

  StanislavBreadless

  committed
  487404c

  Copy full SHA for 487404c

• fix compilation

  StanislavBreadless

  committed
  eb44921

  Copy full SHA for eb44921

• fix rust unit tests

  StanislavBreadless

  committed
  4dd00c9

  Copy full SHA for 4dd00c9

• Merge pull request #383 from matter-labs/sb-sync-boojum-integration-main

  Show description for 7dee1e3
  StanislavBreadless

  authored
  7dee1e3

  Copy full SHA for 7dee1e3

• Add the VmBoojumIntegration version

  ly0va

  committed
  fdf8906

  Copy full SHA for fdf8906

• cherry-pick: Temporarily comment out contract-verification test (#377)

  Show description for c3c5c7d
  ly0va

  committed
  c3c5c7d

  Copy full SHA for c3c5c7d

• Merge branch 'boojum-integration' into bh-evm-294-synchronise-linting-rules-of-repositories

  benceharomi

  committed
  27f76f0

  Copy full SHA for 27f76f0

• Fix interaction with core

  ly0va

  committed
  9c7706d

  Copy full SHA for 9c7706d

• sync with updated linting

  StanislavBreadless

  committed
  04a0802

  Copy full SHA for 04a0802

• nit for better compilation

  StanislavBreadless

  committed
  4787e86

  Copy full SHA for 4787e86

• Use zkevm 1.4.0

  Show description for 27eaf9b
  Deniallugo

  committed
  27eaf9b

  Copy full SHA for 27eaf9b

• fix unit tests

  StanislavBreadless

  committed
  041a67d

  Copy full SHA for 041a67d

• Merge pull request #393 from matter-labs/deniallugo-use-zkevm-v140

  Show description for 92d8235
  Deniallugo

  authored
  92d8235

  Copy full SHA for 92d8235

• Merge branch 'boojum-integration' into more-vm-for-the-multivm-god

  ly0va

  committed
  d5c0299

  Copy full SHA for d5c0299

• update hardhat package everywhere

  StanislavBreadless

  committed
  f3532ad

  Copy full SHA for f3532ad

Commits on Nov 3, 2023

• fix lints

  StanislavBreadless

  committed
  f848c44

  Copy full SHA for f848c44

• Update compiler.ts

  benceharomi

  authored
  9fb881d

  Copy full SHA for 9fb881d

• @typescript-eslint/eslint-plugin updated

  benceharomi

  committed
  0cff45d

  Copy full SHA for 0cff45d

• fixed eslint errors

  benceharomi

  committed
  aa54e7a

  Copy full SHA for aa54e7a

• Merge pull request #376 from matter-labs/sb-sync-with-release-contracts

  Show description for 517e707
  StanislavBreadless

  authored
  517e707

  Copy full SHA for 517e707

• basic merge (no compilation)

  StanislavBreadless

  committed
  f032c89

  Copy full SHA for f032c89

• correct protocol version

  StanislavBreadless

  committed
  3337e5e

  Copy full SHA for 3337e5e

• Add new bootloaders

  ly0va

  committed
  0cd8883

  Copy full SHA for 0cd8883

• Fix unfortunate wildcard match

  ly0va

  committed
  9d11bfd

  Copy full SHA for 9d11bfd

• Restore tests

  ly0va

  committed
  8603a1b

  Copy full SHA for 8603a1b

• cherry-pick: Make calculation for pubdata a bit more percise (#392)

  Show description for 5001075
  

  Deniallugo

  authored and

  ly0va

  committed
  5001075

  Copy full SHA for 5001075

• Merge remote-tracking branch 'origin/main' into sb-sync-main-boojum-integration

  ly0va

  committed
  063874f

  Copy full SHA for 063874f

• Fix test

  ly0va

  committed
  0dd3741

  Copy full SHA for 0dd3741

• Merge pull request #406 from matter-labs/sb-sync-main-boojum-integration

  Show description for 2288bea
  StanislavBreadless

  authored
  2288bea

  Copy full SHA for 2288bea

• Update old refund tracer

  ly0va

  committed
  64eec23

  Copy full SHA for 64eec23

• Fix lints

  ly0va

  committed
  e364a4f

  Copy full SHA for e364a4f

• update boojum contracts

  StanislavBreadless

  committed
  345b4e6

  Copy full SHA for 345b4e6

• Merge pull request #391 from matter-labs/more-vm-for-the-multivm-god

  Show description for ee82e3e
  ly0va

  authored
  ee82e3e

  Copy full SHA for ee82e3e

• make the latest contracts work

  StanislavBreadless

  committed
  b3ff655

  Copy full SHA for b3ff655

• Merge pull request #407 from matter-labs/sb-update-contracts

  Show description for cd68718
  StanislavBreadless

  authored
  cd68718

  Copy full SHA for cd68718

Commits on Nov 5, 2023

• use contracts from main

  StanislavBreadless

  committed
  9bf4468

  Copy full SHA for 9bf4468

Commits on Nov 6, 2023

• Merge pull request #411 from matter-labs/sb-use-contracts-from-main

  Show description for b4eaf7d
  StanislavBreadless

  authored
  b4eaf7d

  Copy full SHA for b4eaf7d

• fix vm nits

  StanislavBreadless

  committed
  7360070

  Copy full SHA for 7360070

• fix PR comments 2

  StanislavBreadless

  committed
  155dea7

  Copy full SHA for 155dea7

• different types for system and user logs

  StanislavBreadless

  committed
  3ca96fc

  Copy full SHA for 3ca96fc

• fix errors

  StanislavBreadless

  committed
  c16a222

  Copy full SHA for c16a222

• add unit test for pubdata

  StanislavBreadless

  committed
  4a77b9c

  Copy full SHA for 4a77b9c

• do not override old api bootloader

  StanislavBreadless

  committed
  8e06c95

  Copy full SHA for 8e06c95

• use static dispatch

  StanislavBreadless

  committed
  78342c2

  Copy full SHA for 78342c2

• fix lint

  StanislavBreadless

  committed
  f01187c

  Copy full SHA for f01187c

• panic formatting

  StanislavBreadless

  committed
  f14e7b5

  Copy full SHA for f14e7b5

• enum for prover at genesis

  StanislavBreadless

  committed
  d0ebfea

  Copy full SHA for d0ebfea

• Some fixes

  perekopskiy

  committed
  e7879b0

  Copy full SHA for e7879b0

• more thorough replacement of logs -> user/system logs

  StanislavBreadless

  committed
  a5b5135

  Copy full SHA for a5b5135

• rollback changes in core/lib/types/src/eth_sender.rs

  StanislavBreadless

  committed
  af87590

  Copy full SHA for af87590

• link todo task

  StanislavBreadless

  committed
  911596e

  Copy full SHA for 911596e

• fix

  perekopskiy

  committed
  a28ab30

  Copy full SHA for a28ab30

• make rust lints pass

  StanislavBreadless

  committed
  75f427d

  Copy full SHA for 75f427d

• remove unneeded metrics import

  StanislavBreadless

  committed
  e728767

  Copy full SHA for e728767

• Merge pull request #415 from matter-labs/sb-fixes-for-pr

  Show description for ac9c6e2
  StanislavBreadless

  authored
  ac9c6e2

  Copy full SHA for ac9c6e2

• Rename

  perekopskiy

  committed
  df92671

  Copy full SHA for df92671

• Merge pull request #416 from matter-labs/perekopskiy-fix-boojum-diff-a-bit

  Show description for c0dba4a
  perekopskiy

  authored
  c0dba4a

  Copy full SHA for c0dba4a

• use contracts from main

  StanislavBreadless

  committed
  3739b02

  Copy full SHA for 3739b02

• todo notice

  StanislavBreadless

  committed
  e3f60aa

  Copy full SHA for e3f60aa

• Merge pull request #420 from matter-labs/sb-use-main-contracts

  Show description for e596008
  StanislavBreadless

  authored
  e596008

  Copy full SHA for e596008

• Merge pull request #421 from matter-labs/main

  Show description for 68be91d
  StanislavBreadless

  authored
  68be91d

  Copy full SHA for 68be91d

• fix mps comments

  StanislavBreadless

  committed
  39fb338

  Copy full SHA for 39fb338

• resolve linting

  StanislavBreadless

  committed
  76eb720

  Copy full SHA for 76eb720

• Merge pull request #422 from matter-labs/sb-fix-mp-coments

  Show description for e61d9e5
  StanislavBreadless

  authored
  e61d9e5

  Copy full SHA for e61d9e5