Merge branch 'matter-labs:main' into main

MoneyBund · Nov 1, 2023 · 49639be · 49639be
2 parents 28d74a9 + 1b6e2af
commit 49639be
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,8 @@ jobs:
             prover:
               - 'prover/**'
               - '!prover/CHANGELOG.md'
+              - '!prover/setup-data-cpu-keys.json'
+              - '!prover/setup-data-gpu-keys.json'
               - 'docker/prover*/**'
               - '.github/workflows/build-prover-template.yml'
               - '.github/workflows/ci-prover-reusable.yml'

diff --git a/docs/advanced/bytecode_compression.md b/docs/advanced/bytecode_compression.md
@@ -55,7 +55,7 @@ For bytecode to be considered valid it must satisfy the following:
 2. Bytecode length must be a multiple of 32.
 3. Number of words cannot be even.
 
-[Source](https://github.com/matter-labs/zksync-2-dev/blob/ec4037ca0d9dc148eda3ca9e04380302574e03d8/core/lib/utils/src/bytecode.rs#L133)
+[Source](https://github.com/matter-labs/zksync-era/blob/main/core/lib/utils/src/bytecode.rs#L133)
 
 ### Compression Algorithm
 

diff --git a/docs/advanced/gas_and_fees.md b/docs/advanced/gas_and_fees.md
@@ -124,10 +124,10 @@ There are a few reasons why refunds might be 'larger' on zkSync (i.e., why we mi
   impacts the amount of gas used by pubdata.
 
 [main_node_fetcher]:
-  https://github.com/matter-labs/zksync-2-dev/blob/d590b3f0965a23eb0011779aab829d86d4fdc1d1/core/bin/zksync_core/src/l1_gas_price/main_node_fetcher.rs#L33
+  https://github.com/matter-labs/zksync-era/blob/main/core/lib/zksync_core/src/l1_gas_price/main_node_fetcher.rs#L32
   'main node fetcher'
 [gas_adjuster]:
-  https://github.com/matter-labs/zksync-2-dev/blob/d590b3f0965a23eb0011779aab829d86d4fdc1d1/core/bin/zksync_core/src/l1_gas_price/gas_adjuster/mod.rs#L25
+  https://github.com/matter-labs/zksync-era/blob/main/core/lib/zksync_core/src/l1_gas_price/gas_adjuster/mod.rs#L30
   'gas_adjuster'
 [get_txs_fee_in_wei]:
   https://github.com/matter-labs/zksync-era/blob/d590b3f0965a23eb0011779aab829d86d4fdc1d1/core/bin/zksync_core/src/api_server/tx_sender/mod.rs#L450

diff --git a/docs/advanced/how_call_works.md b/docs/advanced/how_call_works.md
@@ -109,10 +109,10 @@ In this article, we covered the 'life of a call' from the RPC to the inner worki
   https://github.com/matter-labs/zksync-era/blob/edd48fc37bdd58f9f9d85e27d684c01ef2cac8ae/core/bin/zksync_core/src/api_server/web3/backend_jsonrpc/namespaces/eth.rs
   'namespaces RPC api'
 [namespaces_rpc_impl]:
-  https://github.com/matter-labs/zksync-2-dev/blob/edd48fc37bdd58f9f9d85e27d684c01ef2cac8ae/core/bin/zksync_core/src/api_server/web3/namespaces/eth.rs#L94
+  https://github.com/matter-labs/zksync-era/blob/main/core/lib/zksync_core/src/api_server/web3/namespaces/eth.rs#L94
   'namespaces RPC implementation'
 [execution_sandbox]:
-  https://github.com/matter-labs/zksync-2-dev/blob/dc3b3d6b055c558b0e1a76ef5de3184291489d9f/core/bin/zksync_core/src/api_server/execution_sandbox.rs#L99
+  https://github.com/matter-labs/zksync-era/blob/main/core/lib/zksync_core/src/api_server/execution_sandbox/execute.rs
   'execution sandbox'
 [vm_code]:
   https://github.com/matter-labs/zksync-2-dev/blob/dc3b3d6b055c558b0e1a76ef5de3184291489d9f/core/lib/vm/src/vm.rs#L544

diff --git a/docs/advanced/prover_keys.md b/docs/advanced/prover_keys.md
@@ -31,6 +31,8 @@ SNARK based with KZG commitment. This results in slightly different contents of
 
 ### Setup key (big, 14GB)
 
+> In the following [CPU](https://github.com/matter-labs/zksync-era/blob/main/prover/setup-data-cpu-keys.json) and [GPU](https://github.com/matter-labs/zksync-era/blob/main/prover/setup-data-gpu-keys.json) links, you'll find GCS buckets containing the latest keys.
+
 The primary key for a given circuit is called `setup key`. These keys can be substantial in size - approximately 14GB
 for our circuits. Due to their size, we don't store them directly on GitHub; instead, they need to be generated.
 

diff --git a/docs/setup-dev.md b/docs/setup-dev.md
@@ -150,7 +150,7 @@ installed toolchains
 active toolchain
 ----------------
 
-1.67.1-aarch64-apple-darwin (overridden by '/Users/user/workspace/zksync-2-dev/rust-toolchain')
+1.67.1-aarch64-apple-darwin (overridden by '/Users/user/workspace/zksync-era/rust-toolchain')
 ```
 
 If you see `x86_64` mentioned in the output, probably you're running (or used to run) your IDE/terminal in Rosetta. If

diff --git a/prover/setup-data-cpu-keys.json b/prover/setup-data-cpu-keys.json
@@ -0,0 +1,5 @@
+{
+  "us": "gs://matterlabs-setup-data-us/26ee1fb/",
+  "europe": "gs://matterlabs-setup-data-europe/26ee1fb/",
+  "asia": "gs://matterlabs-setup-data-asia/26ee1fb/"
+}
diff --git a/prover/setup-data-gpu-keys.json b/prover/setup-data-gpu-keys.json
@@ -0,0 +1,5 @@
+{
+  "us": "gs://matterlabs-setup-data-us/26ee1fb-gpu/",
+  "europe": "gs://matterlabs-setup-data-europe/26ee1fb-gpu/",
+  "asia": "gs://matterlabs-setup-data-asia/26ee1fb-gpu/"
+}