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

fix: 1.5.0 + validium (contracts only) patches #1911

Merged
merged 4 commits into from
May 11, 2024
Merged

fix: 1.5.0 + validium (contracts only) patches #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a593089
Update zkevm
EmilLuta May 11, 2024
c4412be
Update VKs
EmilLuta May 11, 2024
a14c6d6
Update contracts
EmilLuta May 11, 2024
b38e8e0
contracts.toml genesis.yaml vk hashes
kelemeno May 11, 2024
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
2 changes: 1 addition & 1 deletion contracts
Open in desktop
Submodule contracts updated 3 files
+4 −4 l1-contracts/contracts/state-transition/Verifier.sol
+3 −0 l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol
+16 −16 tools/data/scheduler_key.json
6 changes: 3 additions & 3 deletions etc/env/base/contracts.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ MAX_NUMBER_OF_HYPERCHAINS = 100
L1_SHARED_BRIDGE_PROXY_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
L2_SHARED_BRIDGE_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
L2_SHARED_BRIDGE_IMPL_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
FRI_RECURSION_LEAF_LEVEL_VK_HASH = "0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6"
FRI_RECURSION_LEAF_LEVEL_VK_HASH = "0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb"
FRI_RECURSION_NODE_LEVEL_VK_HASH = "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8"
FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH = "0x6f7e6423c7241bb691c2ad291a8a3e8cb505091117ed8a38ade8f4224b8cf58e"
SNARK_WRAPPER_VK_HASH = "0x1d485be42d712856dfe85b3cf7823f020fa5f83cb41c83f9da307fdc2089beee"
FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH = "0x712bb009b5d5dc81c79f827ca0abff87b43506a8efed6028a818911d4b1b521f"
SNARK_WRAPPER_VK_HASH = "0x1e2d8304351d4667f0e13b0c51b30538f4dc6ece2c457babd03a9f3a1ec523b3"
SHARED_BRIDGE_UPGRADE_STORAGE_SWITCH = 0
ERA_CHAIN_ID = 9
ERA_DIAMOND_PROXY_ADDR = "0x0000000000000000000000000000000000000000"
Expand Down
4 changes: 2 additions & 2 deletions etc/env/file_based/genesis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ l1_chain_id: 9
l2_chain_id: 270
fee_account: '0x0000000000000000000000000000000000000001'
prover:
recursion_scheduler_level_vk_hash: 0x6f7e6423c7241bb691c2ad291a8a3e8cb505091117ed8a38ade8f4224b8cf58e
recursion_scheduler_level_vk_hash: 0x712bb009b5d5dc81c79f827ca0abff87b43506a8efed6028a818911d4b1b521f
recursion_node_level_vk_hash: 0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8
recursion_leaf_level_vk_hash: 0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6
recursion_leaf_level_vk_hash: 0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb
recursion_circuits_set_vks_hash: '0x0000000000000000000000000000000000000000000000000000000000000000'
dummy_verifier: true
l1_batch_commit_data_generator_mode: Rollup
2 changes: 1 addition & 1 deletion prover/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions prover/vk_setup_data_generator_server_fri/data/commitments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"leaf": "0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6",
"leaf": "0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb",
"node": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
"scheduler": "0x6f7e6423c7241bb691c2ad291a8a3e8cb505091117ed8a38ade8f4224b8cf58e",
"snark_wrapper": "0x1d485be42d712856dfe85b3cf7823f020fa5f83cb41c83f9da307fdc2089beee"
"scheduler": "0x712bb009b5d5dc81c79f827ca0abff87b43506a8efed6028a818911d4b1b521f",
"snark_wrapper": "0x1e2d8304351d4667f0e13b0c51b30538f4dc6ece2c457babd03a9f3a1ec523b3"
}
32 changes: 16 additions & 16 deletions prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
"gate_setup_commitments": [
{
"x": [
13368816467732756588,
12631704582998645112,
2875950984924293274,
3113194142004855172
8178243913255437111,
9398348572260555091,
14657992099509887799,
1030823578680699945
],
"y": [
3570060617207608740,
2032397225743366002,
5866786775367305329,
1313634009443853971
8062596345722628335,
5140058053345046852,
9673165209890295067,
2913587396604797449
],
"infinity": false
},
Expand Down Expand Up @@ -96,16 +96,16 @@
},
{
"x": [
13727181310656943815,
296737807969282193,
6059560013411781327,
1793671435315065066
5606078582690972844,
9347237689207090072,
10709271382733671055,
2779756728641347707
],
"y": [
1522594187298952706,
6626811309287846888,
8870954808386738181,
171006237191164060
4702897423318899131,
17259910834137606252,
13698546488864641154,
589739430090735278
],
"infinity": false
},
Expand Down
128 changes: 64 additions & 64 deletions prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,100 +183,100 @@
},
"setup_merkle_tree_cap": [
[
13896948611834593423,
10739171121598510037,
14644834046753564791,
4360843539773747427
7154563340306829345,
4167812108218505085,
2114021314254176122,
4894310467838038109
],
[
8204948453085268400,
5108185186411680645,
17237345086095082613,
15598752761538039070
17922212241351519389,
14339605334507240171,
7925286130383118388,
1445410173593166394
],
[
2435716904309846305,
9180607226658870953,
2889966903543001551,
12400444599683159672
5839221539582761049,
15858769934654716193,
468052734284287913,
6990561860497950404
],
[
8691596138818728983,
11698971554099221786,
8315617191876448467,
6538895242313168552
16574202954191578690,
17552130801345477268,
12807684393811337091,
753015121532572144
],
[
3514756029778769795,
3213896211356211770,
4206721448256756017,
10994873081142168370
849625079235674036,
13995586153356059789,
5917666249766347534,
5992908578126056166
],
[
9636234821773978855,
13423106705198543631,
11033759238703862309,
3693888045153294219
10080506458053730147,
16734132738308321062,
254454799928044308,
5501345998779013411
],
[
17154881581580079047,
17638958840752522311,
11249541935180794823,
18306639190673569946
11870401457159086330,
5352004714978243638,
8519481313878134830,
5209878405548082874
],
[
11697030042291776640,
8878944228016563318,
4821297323390991202,
7984276648782952956
2638705265919897989,
9999391916637082215,
15322403547173605865,
3543154816152872980
],
[
911508924749467866,
3227909688206719884,
6228498707672435650,
8539337051830444419
6011969999251153249,
4219296601081471793,
5273860794924233011,
13100434064597324925
],
[
4572358787068684706,
15154879951035409056,
3646158963885086788,
12085983065815184081
11316516401706072426,
10775743981153722970,
10155479750195589956,
18078175225231669825
],
[
10318506905205877654,
17707694135228571707,
3525560955795132109,
9501758344190815997
9068711432585175192,
16340990893205302065,
14774515230244825760,
11463992972678257939
],
[
5410481179644088449,
9056161267199703092,
13465530290682823967,
15289674919589521672
16947734743548330074,
2379730538645284049,
10641302221597231310,
13053648824714417623
],
[
4965356010295770314,
17507071322248166319,
12076439523053350546,
18059347461308005529
5493833286187703125,
18207290467457658085,
8193466773080472137,
17298262548282433143
],
[
1670681604092504759,
597441042450901284,
6484678487635716290,
2974179381928385844
9707453508760505199,
3343686055078566258,
13549406143835116372,
8952390690848597815
],
[
18300503545648094088,
15364161994855546440,
9060954711396886167,
6277373194857930821
5265332609373893402,
1535863897437412425,
2808072825532285669,
16048155882008071503
],
[
7043660451869400465,
13221681766094587194,
17770633076997657669,
13192995018654752003
1042305886756595887,
11444556655158841758,
17508395934850449758,
17063565913047202963
]
]
}
Expand Down
Loading
Loading