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.

Sign up for GitHub

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

Jump to bottom

[WIP] Validium PoC #5

Closed
wants to merge 185 commits into from
Closed

[WIP] Validium PoC #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
b2263ee
boojum integration
StanislavBreadless Sep 29, 2023
1ba1b5e
change verifier
StanislavBreadless Sep 29, 2023
9557e3e
roll back changes
StanislavBreadless Sep 29, 2023
6bfa1bf
fix issues with detecting upgrades
StanislavBreadless Oct 1, 2023
14268ba
fix CI
StanislavBreadless Oct 2, 2023
83ac4cf
Merge pull request #141 from matter-labs/sb-fix-boojum-integration
StanislavBreadless Oct 2, 2023
3930c5d
chore(ci): Fixing CI (#150)
mm-zk Oct 4, 2023
2a5c072
feat(prover): Witness change for snark wrapper, updated keys (#151)
mm-zk Oct 4, 2023
d4f292b
feat(boojum): Adding `zk status prover` command (#128)
mm-zk Oct 4, 2023
1625ec2
fix(boojum): Don't pass aggregation_results as recursive aggregation …
mm-zk Oct 4, 2023
867f2bf
feat(boojum): added flag to control prover selection at genesis (#158)
mm-zk Oct 5, 2023
6040e37
fix(prover): Use SNARK wrapper VK for picking prover jobs (#142)
ly0va Oct 5, 2023
2bc95e9
chore: Bump contracts and system-contracts submodules (#160)
ly0va Oct 5, 2023
7608e5f
chore(boojum): Merge main into boojum-integration (#164)
ly0va Oct 5, 2023
16dc31c
sync with main
StanislavBreadless Oct 5, 2023
ff0c387
updated fee model for new state diff compression
koloz193 Oct 6, 2023
e265187
fixed write size calculation
koloz193 Oct 6, 2023
ecad4b6
allow if statement comparison
koloz193 Oct 6, 2023
481e417
update how size is calculated
koloz193 Oct 6, 2023
1026dd5
only charge for difference in bytes if more than already paid
koloz193 Oct 6, 2023
742ec84
fix(boojum): Fix VK in prover_fri_protocol_versions (#174)
ly0va Oct 9, 2023
ab384c2
Merge remote-tracking branch 'origin/main' into lyova-merge-main-into…
ly0va Oct 9, 2023
d2ca29b
Merge pull request #177 from matter-labs/lyova-merge-main-into-boojum
ly0va Oct 9, 2023
9b2b576
store initial seen value and compare to that for charging users
koloz193 Oct 10, 2023
f943c03
remove unused var
koloz193 Oct 10, 2023
e9b9ae7
merge main into boojum integration
StanislavBreadless Oct 11, 2023
35fef5a
remove accidental prints
StanislavBreadless Oct 11, 2023
70bc440
add logs for debugging
StanislavBreadless Oct 11, 2023
958cbaf
hopefully fix revert test
StanislavBreadless Oct 11, 2023
548689b
remove helper console logs
StanislavBreadless Oct 11, 2023
c7153bf
Merge pull request #197 from matter-labs/sb-merge-main-into-boojum-in…
StanislavBreadless Oct 11, 2023
f56e5ed
Merge branch 'boojum-integration' into zk-fees-pubdata
koloz193 Oct 11, 2023
5a015c1
use 1.4.0 in vm crate
StanislavBreadless Oct 12, 2023
9eefd43
Merge pull request #203 from matter-labs/sb-integrate-1-4-0
StanislavBreadless Oct 12, 2023
018a71b
Remove some RocksDB code diff
perekopskiy Oct 12, 2023
1d6fda4
Run migration till the end when initting
perekopskiy Oct 12, 2023
5e7bc64
Merge pull request #210 from matter-labs/fix-boojum-rocksdb
perekopskiy Oct 12, 2023
3014213
reverted changes to old file
koloz193 Oct 16, 2023
616a526
simplified calculation logic
koloz193 Oct 16, 2023
4716fab
store initial values and check for refund amount based on amount of p…
koloz193 Oct 16, 2023
b30f9f8
use query timestamp
koloz193 Oct 17, 2023
e98780f
sync boojum integration with main
StanislavBreadless Oct 17, 2023
894b323
fix unit tests
StanislavBreadless Oct 18, 2023
341d484
Merge branch 'boojum-integration' into zk-fees-pubdata
koloz193 Oct 18, 2023
6d60703
use full mode in revert test
StanislavBreadless Oct 18, 2023
0ea94d2
remove unneeded print
StanislavBreadless Oct 18, 2023
2a67ab7
fix fee test
StanislavBreadless Oct 18, 2023
4c2d597
support commitments for next version
StanislavBreadless Oct 18, 2023
71ffe99
Merge pull request #253 from matter-labs/sb-merge-main-into-boojum
ly0va Oct 18, 2023
e798ba7
merge boojum
koloz193 Oct 19, 2023
3da317c
updated cargo lock and removed duplicate const
koloz193 Oct 19, 2023
42ab3ae
removed unnecessary calls
koloz193 Oct 20, 2023
b235187
Merge pull request #168 from matter-labs/zk-fees-pubdata
koloz193 Oct 20, 2023
744197a
Merge remote-tracking branch 'origin/main' into boojum-integration
ly0va Oct 25, 2023
83eb614
Remove legacy types and keep only new types
Deniallugo Oct 25, 2023
2530061
feat: contracts submodules linting commands
benceharomi Oct 25, 2023
f802bf3
fmt: json, yaml extensions added to prettier
benceharomi Oct 25, 2023
0967ba0
fmt: json and yaml files formatted
benceharomi Oct 25, 2023
db4ff0f
lint: sol lint rule update + submodule ignore
benceharomi Oct 25, 2023
13a15ca
Revert "fmt: json and yaml files formatted"
benceharomi Oct 25, 2023
2639834
Revert "fmt: json, yaml extensions added to prettier"
benceharomi Oct 25, 2023
574cde7
Fix state_keeper tests
ly0va Oct 25, 2023
f071cff
Fix eth_watch unit tests
ly0va Oct 25, 2023
37fc6bd
Fix empty system logs
ly0va Oct 26, 2023
12ffbf5
updated storage oracle to calculate pubdata bytes correctly
koloz193 Oct 26, 2023
3628d62
Merge branch 'main' into lyova-merge-main-into-boojum-again
koloz193 Oct 26, 2023
f7ac2de
resolved merge conflicts
koloz193 Oct 26, 2023
69c7b9e
Fix some lints
ly0va Oct 27, 2023
af07c50
remove unused variable
koloz193 Oct 27, 2023
fc0fd77
Fix invalid error log
ly0va Oct 27, 2023
5e7cc1c
Fix more lints
ly0va Oct 30, 2023
0cecd94
Merge remote-tracking branch 'origin/main' into lyova-merge-main-into…
ly0va Oct 30, 2023
86655f2
Fix zk compile
ly0va Oct 30, 2023
a99026e
Bump era-contracts
ly0va Oct 30, 2023
830d719
Merge pull request #307 from matter-labs/lyova-merge-main-into-boojum…
ly0va Oct 30, 2023
90d3b63
sync with latest release
StanislavBreadless Nov 1, 2023
1b9feae
update scripts to use the correct facets
StanislavBreadless Nov 1, 2023
222ae96
sync boojum integration with main
StanislavBreadless Nov 2, 2023
2fb9d43
add initial protocol version
StanislavBreadless Nov 2, 2023
293cc9d
upd unit tests
StanislavBreadless Nov 2, 2023
487404c
fix ext node
StanislavBreadless Nov 2, 2023
eb44921
fix compilation
StanislavBreadless Nov 2, 2023
4dd00c9
fix rust unit tests
StanislavBreadless Nov 2, 2023
7dee1e3
Merge pull request #383 from matter-labs/sb-sync-boojum-integration-main
StanislavBreadless Nov 2, 2023
fdf8906
Add the VmBoojumIntegration version
ly0va Nov 2, 2023
c3c5c7d
cherry-pick: Temporarily comment out contract-verification test (#377)
ly0va Nov 2, 2023
27f76f0
Merge branch 'boojum-integration' into bh-evm-294-synchronise-linting…
benceharomi Nov 2, 2023
9c7706d
Fix interaction with core
ly0va Nov 2, 2023
04a0802
sync with updated linting
StanislavBreadless Nov 2, 2023
4787e86
nit for better compilation
StanislavBreadless Nov 2, 2023
27eaf9b
Use zkevm 1.4.0
Deniallugo Nov 2, 2023
041a67d
fix unit tests
StanislavBreadless Nov 2, 2023
92d8235
Merge pull request #393 from matter-labs/deniallugo-use-zkevm-v140
Deniallugo Nov 2, 2023
d5c0299
Merge branch 'boojum-integration' into more-vm-for-the-multivm-god
ly0va Nov 2, 2023
e1f5934
validium poc
igamigo Nov 2, 2023
e91d542
validium poc
igamigo Nov 2, 2023
f4029c7
fixing overwritten file
igamigo Nov 2, 2023
79e5380
merge fix
igamigo Nov 2, 2023
6331bfe
remove file
igamigo Nov 2, 2023
0d4e6c1
add md
igamigo Nov 2, 2023
2062cbb
correctly saved md
igamigo Nov 2, 2023
ce88d89
correctly saved md
igamigo Nov 2, 2023
3e01bf0
Update validium.md
igamigo Nov 2, 2023
d8c89bf
Update validium.md
igamigo Nov 2, 2023
c5a302c
Update validium.md
igamigo Nov 2, 2023
f3532ad
update hardhat package everywhere
StanislavBreadless Nov 2, 2023
f848c44
fix lints
StanislavBreadless Nov 3, 2023
9fb881d
Update compiler.ts
benceharomi Nov 3, 2023
0cff45d
@typescript-eslint/eslint-plugin updated
benceharomi Nov 3, 2023
aa54e7a
fixed eslint errors
benceharomi Nov 3, 2023
517e707
Merge pull request #376 from matter-labs/sb-sync-with-release-contracts
StanislavBreadless Nov 3, 2023
f032c89
basic merge (no compilation)
StanislavBreadless Nov 3, 2023
3337e5e
correct protocol version
StanislavBreadless Nov 3, 2023
0cd8883
Add new bootloaders
ly0va Nov 3, 2023
9d11bfd
Fix unfortunate wildcard match
ly0va Nov 3, 2023
8603a1b
Restore tests
ly0va Nov 3, 2023
5001075
cherry-pick: Make calculation for pubdata a bit more percise (#392)
Deniallugo Nov 2, 2023
063874f
Merge remote-tracking branch 'origin/main' into sb-sync-main-boojum-i…
ly0va Nov 3, 2023
0dd3741
Fix test
ly0va Nov 3, 2023
2288bea
Merge pull request #406 from matter-labs/sb-sync-main-boojum-integration
StanislavBreadless Nov 3, 2023
64eec23
Update old refund tracer
ly0va Nov 3, 2023
e364a4f
Fix lints
ly0va Nov 3, 2023
345b4e6
update boojum contracts
StanislavBreadless Nov 3, 2023
ee82e3e
Merge pull request #391 from matter-labs/more-vm-for-the-multivm-god
ly0va Nov 3, 2023
b3ff655
make the latest contracts work
StanislavBreadless Nov 3, 2023
cd68718
Merge pull request #407 from matter-labs/sb-update-contracts
StanislavBreadless Nov 3, 2023
9bf4468
use contracts from main
StanislavBreadless Nov 5, 2023
b4eaf7d
Merge pull request #411 from matter-labs/sb-use-contracts-from-main
StanislavBreadless Nov 6, 2023
7360070
fix vm nits
StanislavBreadless Nov 6, 2023
155dea7
fix PR comments 2
StanislavBreadless Nov 6, 2023
3ca96fc
different types for system and user logs
StanislavBreadless Nov 6, 2023
c16a222
fix errors
StanislavBreadless Nov 6, 2023
4a77b9c
add unit test for pubdata
StanislavBreadless Nov 6, 2023
8e06c95
do not override old api bootloader
StanislavBreadless Nov 6, 2023
78342c2
use static dispatch
StanislavBreadless Nov 6, 2023
f01187c
fix lint
StanislavBreadless Nov 6, 2023
f14e7b5
panic formatting
StanislavBreadless Nov 6, 2023
d0ebfea
enum for prover at genesis
StanislavBreadless Nov 6, 2023
e7879b0
Some fixes
perekopskiy Nov 6, 2023
a5b5135
more thorough replacement of logs -> user/system logs
StanislavBreadless Nov 6, 2023
af87590
rollback changes in core/lib/types/src/eth_sender.rs
StanislavBreadless Nov 6, 2023
911596e
link todo task
StanislavBreadless Nov 6, 2023
a28ab30
fix
perekopskiy Nov 6, 2023
75f427d
make rust lints pass
StanislavBreadless Nov 6, 2023
e728767
remove unneeded metrics import
StanislavBreadless Nov 6, 2023
ac9c6e2
Merge pull request #415 from matter-labs/sb-fixes-for-pr
StanislavBreadless Nov 6, 2023
df92671
Rename
perekopskiy Nov 6, 2023
c0dba4a
Merge pull request #416 from matter-labs/perekopskiy-fix-boojum-diff-…
perekopskiy Nov 6, 2023
3739b02
use contracts from main
StanislavBreadless Nov 6, 2023
e3f60aa
todo notice
StanislavBreadless Nov 6, 2023
e596008
Merge pull request #420 from matter-labs/sb-use-main-contracts
StanislavBreadless Nov 6, 2023
68be91d
Merge pull request #421 from matter-labs/main
StanislavBreadless Nov 6, 2023
39fb338
fix mps comments
StanislavBreadless Nov 6, 2023
76eb720
resolve linting
StanislavBreadless Nov 6, 2023
e61d9e5
Merge pull request #422 from matter-labs/sb-fix-mp-coments
StanislavBreadless Nov 6, 2023
0b9ef2a
setup with zk init --validium
igamigo Nov 7, 2023
c716d5d
fix
igamigo Nov 7, 2023
8b56670
readme
igamigo Nov 7, 2023
e4b1c22
Merged upstream/boojum-integration
ElFantasma Nov 7, 2023
0c22dcc
zk fmt
ElFantasma Nov 7, 2023
37a2004
readme and contracts
igamigo Nov 7, 2023
886c3c5
validium contracts
igamigo Nov 7, 2023
fead153
prepare
igamigo Nov 8, 2023
23e06b5
Merge branch 'validium-setup' of https://github.com/lambdaclass/zksyn…
igamigo Nov 8, 2023
f002deb
contracts
igamigo Nov 8, 2023
98f46a5
update submodule
igamigo Nov 8, 2023
be9f295
contracts
igamigo Nov 8, 2023
5cd30c3
rollback submodule
igamigo Nov 8, 2023
8be4722
rollback submodule
igamigo Nov 8, 2023
30bd04d
submodule update (skip validations)
igamigo Nov 8, 2023
6ec4488
boojum code path
igamigo Nov 8, 2023
822852b
fmt and readme improvements
igamigo Nov 8, 2023
f8fed28
Delete core/lib/circuit_breaker/src/facet_selectors.rs
igamigo Nov 8, 2023
5e03baf
Update validium.md
igamigo Nov 8, 2023
017cc81
Merge pull request #6 from lambdaclass/validium-setup
igamigo Nov 8, 2023
84a913e
fix require() failures
igamigo Nov 9, 2023
c5d3da3
remove prints
igamigo Nov 9, 2023
e7eb01f
Merge branch 'boojum-integration' into validium
igamigo Nov 9, 2023
9c24ee7
Update contracts submodule
jrchatruc Nov 12, 2023
c591844
Merge remote-tracking branch 'upstream/main' into validium
jrchatruc Nov 17, 2023
b2b512f
Fix compilation
jrchatruc Nov 21, 2023
05a02c6
Merge branch 'main' of github.com:lambdaclass/zksync-era into validium
ilitteri Dec 14, 2023
f103889
Bring back validium to the init args
ilitteri Dec 14, 2023
9d8a57d
Fix path to volume (relative path is not accepted in docker run -v)
ilitteri Dec 14, 2023
164cc25
Revert "Fix path to volume (relative path is not accepted in docker r…
ilitteri Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cobertura.xml
tags
*.orig
.direnv
.envrc

# Yarn files
.yarn/
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ path = etc/system-contracts
url = https://github.com/matter-labs/era-system-contracts.git
[submodule "contracts"]
path = contracts
url = https://github.com/matter-labs/era-contracts.git
url = https://github.com/lambdaclass/era-contracts.git
Loading
Loading