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

Fork 9 #809

Draft
wants to merge 215 commits into
base: develop
from
Draft
Changes from all commits
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
dbe6a7d
Fork 9 infrastructure
fractasy Feb 29, 2024
3c8c2f4
Manage 2 roms (batch and blob) in MainExecutor
fractasy Mar 1, 2024
15c990f
Integrate rom_collection.json into main executor
fractasy Mar 4, 2024
2553c53
Add Rom::type to fork 9
fractasy Mar 4, 2024
6a8d890
Modify ProverRequest::type for Feijoa
fractasy Mar 5, 2024
9aa38b4
Update executor.proto and implement ProcessBatchV3() method
fractasy Mar 6, 2024
9261644
Added new config parameters for Feijoa
rickb80 Mar 6, 2024
928a040
Merge remote-tracking branch 'origin/fork_9' into fork_9_prover
rickb80 Mar 6, 2024
1f57c52
minor change in README
rickb80 Mar 6, 2024
2ed2600
Merge pull request #795 from 0xPolygonHermez/fork_9_prover
rickb80 Mar 6, 2024
344a178
Implement ProcessBlobInner()
fractasy Mar 6, 2024
cdfe9b0
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 6, 2024
bd016b9
Rename execute to executeBatch()
fractasy Mar 6, 2024
063172b
Implement Prover::provessBlobInner()
fractasy Mar 6, 2024
e256a7a
Implement Executor blob inner methods
fractasy Mar 6, 2024
1faba52
Remove rom_blob.json from fork 9
fractasy Mar 7, 2024
c9ada6b
Create fork_9_blob
fractasy Mar 7, 2024
d52510e
Adapt prover class to blobs
rickb80 Mar 7, 2024
0513364
Add more funcionaity in prover.cpp
rickb80 Mar 7, 2024
38b659a
Merge pull request #798 from 0xPolygonHermez/fork_9-prover
rickb80 Mar 7, 2024
2bf622c
Port FullTracer fixes from develop
fractasy Mar 7, 2024
7d533d4
Config parameters naming changes
rickb80 Mar 8, 2024
8fa437f
Fix Dockerfile-GHA for fork 9
fractasy Mar 11, 2024
c7866e0
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 11, 2024
b7f3a9e
Update aggregator.proto. Implement aggregator client mock.
fractasy Mar 12, 2024
3c70055
Adding all test and new parser, removing unused / unnecessary files. …
RogerTaule Mar 6, 2024
e173556
Minor fix readme
RogerTaule Mar 12, 2024
e494a71
Merge pull request #796 from 0xPolygonHermez/feature/new_parser
RogerTaule Mar 12, 2024
562eb36
MerkleTreeBN128 to work with any power of two
RogerTaule Jul 10, 2023
167325d
Merge pull request #797 from 0xPolygonHermez/feature/flexibleArity
RogerTaule Mar 12, 2024
1b36379
Reusing memory whenever possible
RogerTaule Mar 7, 2024
c6b723b
Merge pull request #799 from 0xPolygonHermez/feature/memoryOptimization
RogerTaule Mar 12, 2024
fbc7a04
Implement new aggregator client for fork 9
fractasy Mar 12, 2024
768e72d
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 12, 2024
02267fd
Updating goldilocks
RogerTaule Mar 12, 2024
61b0e0d
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 12, 2024
5fbded5
Modifiying batch recursive zkin and adding new functions for blob out…
RogerTaule Mar 12, 2024
800f029
New prover constructors and destructor
rickb80 Mar 12, 2024
7257f7b
Prover modifications for forkid_9
rickb80 Mar 12, 2024
f3c2165
Merge remote-tracking branch 'origin/feature/joinzkin' into fork_0_pr…
rickb80 Mar 12, 2024
0f77a79
Add blobInner proof for fork_9
rickb80 Mar 12, 2024
7c7572a
Add aggregated BlobOuter Proof
rickb80 Mar 13, 2024
58e7d5d
add genBlobOuterProof implementation
rickb80 Mar 13, 2024
f1c2add
Add witness hash to db
fractasy Mar 13, 2024
4a7199a
Review all new prover services
rickb80 Mar 13, 2024
aca56fa
Port FullTracer internal call logs from Elderberry (fork 8, release_v…
fractasy Mar 13, 2024
a445a94
Update fork 9 main executor with zkasm optimizations
fractasy Mar 14, 2024
3b2d5da
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 14, 2024
c91e0d1
Port fork 9 changes from batch to blob processor
fractasy Mar 14, 2024
7d8e93a
Load first instance of blob rom
fractasy Mar 14, 2024
19525d4
Merge pull request #806 from 0xPolygonHermez/fork_9-prover
rickb80 Mar 14, 2024
1581232
Add pointer checks after mallocs and callocs
rickb80 Mar 14, 2024
e6dd5a5
Merge pull request #810 from 0xPolygonHermez/fork9_memory
rickb80 Mar 14, 2024
09f71b0
Fix fork 9 blob rom load
fractasy Mar 14, 2024
ce676b0
Start blob executor helpers. Support blob in executor client.
fractasy Mar 15, 2024
8e1191f
Fix generated compilation
fractasy Mar 15, 2024
e9a4fbd
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 15, 2024
46bc6e6
Implementation of test aggregator service
rickb80 Mar 18, 2024
f367ce4
Merge remote-tracking branch 'origin/fork_9' into fork_9-aggregator-s…
rickb80 Mar 18, 2024
fd8eede
Modular arithmetic. Blob rom.
fractasy Mar 18, 2024
59e0c8e
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 18, 2024
8ef6356
Merge pull request #812 from 0xPolygonHermez/fork_9-aggregator-service
rickb80 Mar 18, 2024
49c136b
Update blob rom. Implement BLS12-381.
fractasy Mar 20, 2024
2c8a717
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 20, 2024
b2b9212
first commit for fflonk_setup
xavi-pinsach Mar 9, 2024
fea83e5
first working version
xavi-pinsach Mar 13, 2024
d03a9da
fix update k1k2 computation
xavi-pinsach Mar 13, 2024
59f664c
wip
xavi-pinsach Mar 13, 2024
d4363b3
Fix reserve big buffer in heap instead of stack
xavi-pinsach Mar 13, 2024
105204a
fix linear combination vector must be sorted
xavi-pinsach Mar 13, 2024
2efa5e7
clean code and remove unnecessary includes
xavi-pinsach Mar 14, 2024
ce89d45
fix type
xavi-pinsach Mar 14, 2024
d151ee9
Add new method from RprLE in fr
xavi-pinsach Mar 14, 2024
ba7c8fd
Fixed function loading excess ptau coefficients
xavi-pinsach Mar 14, 2024
21db05f
Merge pull request #808 from 0xPolygonHermez/feature/fflonk_setup
RogerTaule Mar 20, 2024
3d1a449
Update blob rom. onAddBatch function infrastructure. Fix blob bugs.
fractasy Mar 21, 2024
4f63e10
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 21, 2024
5146662
Port Erigon debugging changes from Elderberry (fork8)
fractasy Mar 21, 2024
50c8686
Prepare blob execution of all state machines
fractasy Mar 21, 2024
1e53a8b
Modified agrregator service e2e test
rickb80 Mar 22, 2024
44a2007
Integrating flexible arity + generic parser
RogerTaule Mar 22, 2024
a2306a5
Integrating generic parser + arity
RogerTaule Mar 22, 2024
4dd9439
Minor fix
RogerTaule Mar 22, 2024
6035ad3
Adding checks that were removed
RogerTaule Mar 22, 2024
383fbae
Merge pull request #815 from 0xPolygonHermez/feature/generic_parser
RogerTaule Mar 22, 2024
c06d5e4
Add config.aggregatorClientMaxRecvMsgSize
fractasy Mar 22, 2024
4e34428
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Mar 22, 2024
14cfea3
Fixing compilation
RogerTaule Mar 22, 2024
0010506
Fix Makefile main and pols generators dependency with definitions.hpp
fractasy Mar 24, 2024
baf1092
Fix FullTracer txIndex in forks 8, 9 and 9_blob
fractasy Mar 24, 2024
4b36dc4
Log error_rom and invalid_batch in executor service process batch met…
fractasy Mar 24, 2024
346580e
Add ROM_ERROR_INVALID_L1_INFO_TREE_INDEX. Fix FullTracer onStorageLo…
fractasy Mar 24, 2024
a2bec37
Port splitKey6() optimization to reverse order
fractasy Mar 24, 2024
a756351
Move fork 9 to fork 10, then insert fork 9 from Elderberry
fractasy Mar 25, 2024
3b38650
new feature mem-align-varlen
zkronos73 Mar 26, 2024
56a4b9d
update main pils
zkronos73 Mar 26, 2024
d6875d3
Update blob rom with fork ID=10 and using D instead of SR for state root
fractasy Mar 26, 2024
b9972b1
processBlobInner response
fractasy Mar 26, 2024
7df26fd
update roms
zkronos73 Mar 26, 2024
321d145
Merge branch 'fork_9' into feature/mem-align-varlen-fork10
zkronos73 Mar 26, 2024
29bd5b5
update rom headers and pols
zkronos73 Mar 26, 2024
50e21df
Move blob data hash from context to input
fractasy Mar 26, 2024
e963393
update rom and blob-rom
zkronos73 Mar 26, 2024
6027466
Fix newXxx input fields parsing from JSON
fractasy Mar 27, 2024
c9ae98d
define use_required
zkronos73 Mar 27, 2024
570ea0e
Fix blob executor input 1 processing
fractasy Mar 27, 2024
5f65362
update generator for hashXLen freeInput, only to compile, TODO rest
zkronos73 Mar 27, 2024
c855746
update blob rom.json and memalign compilation errors
zkronos73 Mar 27, 2024
144efc0
Merge branch 'fork_9' into feature/mem-align-varlen-fork10
zkronos73 Mar 27, 2024
f00eceb
Merge pull request #821 from 0xPolygonHermez/feature/mem-align-varlen…
zkronos73 Mar 27, 2024
eb2e522
Add helpers to load new fork 10 batch rom
fractasy Mar 28, 2024
cc0a5a5
fix minor bug on mem_align, add more tests about mem_align
zkronos73 Mar 29, 2024
c7de938
fix offset calculation on getMemValue
zkronos73 Mar 30, 2024
0ff8da7
Merge pull request #824 from 0xPolygonHermez/fix/mem-align-varlen
fractasy Apr 2, 2024
a0e56d9
Merge pull request #825 from 0xPolygonHermez/fix/eval-get-mem-addr-of…
fractasy Apr 2, 2024
fe06621
Change e2e input files...
rickb80 Apr 2, 2024
3a4ad34
Merge remote-tracking branch 'origin/fork_9' into fork_9-aggregator_s…
rickb80 Apr 2, 2024
8cd4a48
Update .proto files and adapt fork 10 code to these changes
fractasy Apr 2, 2024
cadbac1
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Apr 2, 2024
e9b672d
Implement gemMemAddr, condConst
fractasy Apr 2, 2024
444c7fe
Synchronize fork_10 and fork_10_blob code
fractasy Apr 3, 2024
e6dd0f8
Update aggregator.proto, removing new_loca_exit_root from response
fractasy Apr 3, 2024
8cc36ff
Fix git submodule update in GHA
fractasy Apr 3, 2024
885b71a
Update fork 10 rom files
fractasy Apr 3, 2024
707ab75
Rename config.loadDiagnosticRom. Update diagnostic roms. Return 3 n…
fractasy Apr 4, 2024
2a5e269
Adadpting e2e test to new input names
rickb80 Apr 4, 2024
c0907b7
Update executor.proto ROM_BLOB_ERROR_INVALID_FORCED_BATCHES
fractasy Apr 4, 2024
14185c5
Merge pull request #814 from 0xPolygonHermez/fork_9-aggregator_service
rickb80 Apr 4, 2024
95bba8d
Update diagnostic rom. Fix fork 10 executors to pass diagnostic.
fractasy Apr 5, 2024
0b92998
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Apr 5, 2024
9ea2dcc
Avoid remote reads if database is local
fractasy Apr 7, 2024
07b4ee4
Cleanup temporary witness hash opcode insertion in database
fractasy Apr 8, 2024
a6e0050
10k batch tests bug fixing, for fork 10
fractasy Apr 9, 2024
cf7c83a
Modifying config parameters and adding checks for blob_outer and rena…
RogerTaule Mar 20, 2024
cac0a43
Minor fixes
RogerTaule Apr 10, 2024
21e5ee2
Merge pull request #813 from 0xPolygonHermez/feature/setup_files
RogerTaule Apr 10, 2024
fcb9265
First round of generated prover files for Feijoa fork 10
fractasy Apr 10, 2024
16c2589
Fix docker image generation, missing fork_10_blob rom.json
fractasy Apr 10, 2024
c4c4755
Remove failing collection test
fractasy Apr 10, 2024
039a27d
Add e2e files
rickb80 Apr 10, 2024
2410b35
Minor fix regarding managing inputs for aggregator service
rickb80 Apr 11, 2024
4f63fc3
New unofficial rom with fix to pols.A[0]!=0
fractasy Apr 11, 2024
105fefa
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Apr 11, 2024
34c621e
Fix required.Arith.selEq4 in main executor
fractasy Apr 11, 2024
d00c4b6
Add db to ProcessBlobInnerRequestV3. Update release generated files.
fractasy Apr 11, 2024
b9d303b
Fix GHA E2E. Port Erigon ResponseDebug changes.
fractasy Apr 11, 2024
97cf7f8
Fix arith SM pols.x3clock population after main loop
fractasy Apr 12, 2024
2b3e112
Fixing error main executor + chelpers_steps
RogerTaule Apr 12, 2024
1fa5d03
Save Input to string to generate logs in Prover
fractasy Apr 15, 2024
7a4286a
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Apr 15, 2024
6c91b2b
Load timestamp limit in forks >=7. Fix Context::printRegs().
fractasy Apr 15, 2024
6e764e8
Fix Context::printRegs()
fractasy Apr 16, 2024
25ad755
Limit CTX_MAX value. Fix Input timestampLimit.
fractasy Apr 16, 2024
c1be38b
Port FullTracer::fillInReadWriteAddresses() changes in all forks from…
fractasy Apr 17, 2024
4f670b5
Call fillInReadWriteAddresses() from FullTracer::onFinishBatch() in a…
fractasy Apr 17, 2024
1452c7a
Fix call to fillInReadWriteAddresses() from FullTracer::onFinishBatch()
fractasy Apr 17, 2024
d33bcfb
Update rom_diagnostic.json
fractasy Apr 18, 2024
da7dea5
Fix pols.condConst fill-in
fractasy Apr 18, 2024
1874672
Update rom_diagnostic.json in forks 10 and 10_blob
fractasy Apr 18, 2024
17b8e7b
Implement fea384ToScalar() and scalarTofea384()
fractasy Apr 18, 2024
f007c5d
Fix pols.condConst in fork_10_blob
fractasy Apr 18, 2024
2b7cd1b
Implement kzgXxx helpers for blob inner
fractasy Apr 19, 2024
2f94766
Add l1_info_tree_index_min_timestamp to ProcessStatelessBatchRequestV…
fractasy Apr 19, 2024
f1eae0b
Implement scalar2ba48. Fix executor client kzg fields.
fractasy Apr 22, 2024
2a0094a
Change version to v7.0.0-RC1
fractasy Apr 22, 2024
4db10fe
Fix blob-rom.json copy in docker
fractasy Apr 22, 2024
c587ca6
Change version to v7.0.0-RC2
fractasy Apr 22, 2024
f0f0cc5
Port release changes on minTimestampMap
fractasy Apr 23, 2024
9554b1f
Fix blob inner execution using mod BLS prime
fractasy Apr 23, 2024
6b44879
Correct inputFile in BatchProof runFile
rickb80 Apr 23, 2024
9289916
Generate executor_errors.json if config.saveExecutorErrors
fractasy Apr 23, 2024
499d987
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy Apr 23, 2024
85e900d
Delete config.maxProverThreads, obsoleted
fractasy Apr 24, 2024
e301167
Add version to ResponseDebug. Chane version to v7.0.0-RC3.
fractasy Apr 24, 2024
acf00bd
Return error_log in V3 executor methods. Change version to v7.0.0-RC4.
fractasy Apr 25, 2024
31832a2
Add counters reserve and zkPC to ProcessBatchV3 logs
fractasy Apr 25, 2024
a61818a
Datastream new spec based on protobuf
fractasy Apr 29, 2024
1658cce
Fix pre-EIP-155 TX encoding
fractasy May 2, 2024
36451a6
Implement Batch start/end in datastream protobuf flavor
fractasy May 2, 2024
2a69fa0
Update datastream.proto to latest spec; no code changes required
fractasy May 6, 2024
226f03b
Implement config.maxExecutorReceiveMessageSize and config.maxExecutor…
fractasy May 6, 2024
dad71d7
New Arith SM
fractasy May 8, 2024
192ffb9
Port stateless aggregator datastream removal
fractasy May 8, 2024
b33266a
New associative cache
rickb80 May 9, 2024
a383ee6
Implement BLS12-381 helpers
fractasy May 9, 2024
075c8f3
Assume update=false in reincert scenarios
rickb80 May 10, 2024
f646224
elminate unused code
rickb80 May 10, 2024
251cdca
Merge pull request #836 from 0xPolygonHermez/fork_9-associative_cache
rickb80 May 10, 2024
f6fee38
Port changes to reset cache before importing input.db
fractasy May 10, 2024
486cf80
Port config.hashDBSingleton changes from Elderberry 2
fractasy May 13, 2024
ce144dd
Port config.hashDBSingleton functionality to all forks, native code
fractasy May 13, 2024
5edc257
Update main generator, disabled.
fractasy May 20, 2024
adaad04
Fix main generator happy path
fractasy May 22, 2024
af843cc
Fix compilation including zklog.hpp
fractasy May 22, 2024
e4eb29f
Fix git submodule update in docker generation files
fractasy May 23, 2024
e540c8e
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy May 23, 2024
01529b4
Use config.aggregatorClientMaxRecvMsgSize in aggregator client mock
fractasy May 23, 2024
a2b6e1a
Create mainGenerator10
fractasy May 23, 2024
884090f
Merge branch 'fork_9' of github.com:0xPolygonHermez/zkevm-prover into…
fractasy May 23, 2024
07bee99
Avoid use of bJump in main generator
fractasy May 23, 2024
dfa7c09
Reduce main executor generated code size for old forks
fractasy May 24, 2024
ee030b5
Reduce main executor generated code size for fork 10
fractasy May 24, 2024
2835901
Activate main executor generated code
fractasy May 24, 2024
828cd77
Optimize memAddr check in main generator
fractasy May 27, 2024
4534521
Add PolsTest
fractasy May 27, 2024
78d4510
Create arith, binary and memory helpers
fractasy May 27, 2024
dcec31e
Add memalign helper
fractasy May 27, 2024
03324ea
Add storage helper
fractasy May 28, 2024
c6995be
Add Keccak helper
fractasy May 28, 2024
4a98895
Add Poseidon helper
fractasy May 28, 2024
1f11721
Add SHA helper
fractasy May 28, 2024
3ea5761
Fix time metrics after helpers split
fractasy May 29, 2024
4657483
Optimize memAddr range check in code generator
fractasy May 29, 2024
65c23d0
Add value to pHashDB->set() error traces
fractasy May 29, 2024
7c1f12c
Fix FullTracer::onStoreLog() dataString construction
fractasy May 29, 2024

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.