Merge branch 'matter-labs:main' into main

docs/guides/advanced/02_deposits.md

@@ -158,7 +158,7 @@ The call to requestL2Transaction, is adding the transaction to the priorityQueue
 
 The zk server (that you started with `zk server` command) is listening on events that are emitted from this contract
 (via eth_watcher module -
-[`loop_iteration` function](https://github.com/matter-labs/zksync-era/blob/main/core/lib/zksync_core/src/eth_watch/mod.rs#L163)
+[`loop_iteration` function](https://github.com/matter-labs/zksync-era/blob/main/core/lib/zksync_core/src/eth_watch/mod.rs#L161)
 ) and adds them to the postgres database (into `transactions` table).
 
 You can actually check it - by running the psql and looking at the contents of the table - then you'll notice that

docs/guides/advanced/03_withdrawals.md

@@ -120,7 +120,7 @@ BTW - all the transactions are sent to the 0x54e address - which is the `Diamond
 be different on your local node - see previous tutorial for more info) .
 
 And inside, all three methods above belong to
-[Executor.sol](https://github.com/matter-labs/era-contracts/blob/main/ethereum/contracts/zksync/facets/Executor.sol)
+[Executor.sol](https://github.com/matter-labs/era-contracts/blob/main/l1-contracts/contracts/zksync/facets/Executor.sol)
 facet and you can look at
 [README](https://github.com/matter-labs/era-contracts/blob/main/docs/Overview.md#executorfacet) to see the details of
 what each method does.

docs/guides/advanced/deeper_overview.md

@@ -247,7 +247,7 @@ pub struct ZkSyncUniformCircuitInstance<F: SmallField, S: ZkSyncUniformSynthesis
     pub witness: AtomicCell<Option<S::Witness>>,
 
     // Configuration - that is circuit specific, in case of MainVM - the configuration
-    // is simply the amount of opcodes that we put wihtin 1 circuit.
+    // is simply the amount of opcodes that we put within 1 circuit.
     pub config: std::sync::Arc<S::Config>,
 
     // Circuit 'friendly' hash function.
@@ -363,7 +363,7 @@ entry_point_code: Vec<[u8; 32]>, // for read lobkc must be a bootloader code
 initial_heap_content: Vec<u8>, // bootloader starts with non-deterministic heap
     zk_porter_is_available: bool,
     default_aa_code_hash: U256,
-used_bytecodes: std::collections::HashMap<U256, Vec<[u8; 32]>>, // auxilary information to avoid passing a full set of all used codes
+used_bytecodes: std::collections::HashMap<U256, Vec<[u8; 32]>>, // auxiliary information to avoid passing a full set of all used codes
 ram_verification_queries: Vec<(u32, U256)>, // we may need to check that after the bootloader's memory is filled
     cycle_limit: usize,
 round_function: R, // used for all queues implementation

docs/guides/advanced/how_call_works.md

@@ -122,5 +122,5 @@ In this article, we covered the 'life of a call' from the RPC to the inner worki
   https://github.com/matter-labs/era-system-contracts/blob/93a375ef6ccfe0181a248cb712c88a1babe1f119/bootloader/bootloader.yul
   'bootloader code'
 [init_vm_inner]:
-  https://github.com/matter-labs/zksync-2-dev/blob/dc3b3d6b055c558b0e1a76ef5de3184291489d9f/core/lib/vm/src/vm_with_bootloader.rs#L348
+  https://github.com/matter-labs/zksync-era/blob/main/core/lib/multivm/src/versions/vm_m6/vm_with_bootloader.rs#L330
   'vm constructor'

docs/guides/advanced/how_l2_messaging_works.md

@@ -199,7 +199,7 @@ transmitted to L1 for final verification.
 [event_sink]:
   https://github.com/matter-labs/zksync-era/blob/43d7bd587a84b1b4489f4c6a4169ccb90e0df467/core/lib/vm/src/event_sink.rs#L116
 [log_writing_in_vm]: https://github.com/matter-labs/era-zk_evm/blob/v1.3.2/src/opcodes/execution/log.rs
-[log_opcode]: https://github.com/matter-labs/zkevm_opcode_defs/blob/v1.3.2/src/definitions/log.rs#L16
+[log_opcode]: https://github.com/matter-labs/era-zkevm_opcode_defs/blob/v1.3.2/src/definitions/log.rs#L16
 [zkevm_assembly_parse]:
   https://github.com/matter-labs/zkEVM-assembly/blob/fcfeb51e45544a629d4279b3455def847dcc2505/src/assembly/instruction/log.rs#L32
 [executor_sol]:

docs/guides/setup-dev.md

@@ -36,7 +36,7 @@ zkSync currently can be launched on any \*nix operating system (e.g. any linux d
 If you're using Windows, then make sure to use WSL 2, since WSL 1 is known to cause troubles.
 
 Additionally, if you are going to use WSL 2, make sure that your project is located in the _linux filesystem_, since
-accessing NTFS partitions from inside of WSL is very slow.
+accessing NTFS partitions from within WSL is very slow.
 
 If you're using MacOS with an ARM processor (e.g. M1/M2), make sure that you are working in the _native_ environment
 (e.g. your terminal and IDE don't run in Rosetta, and your toolchain is native). Trying to work with zkSync code via
@@ -82,7 +82,7 @@ sudo usermod -a -G docker your_user_name
 After that, you should logout and login again (user groups are refreshed after the login). The problem should be solved
 at this step.
 
-If logging out does not help, restarting the computer should.
+If logging out does not resolve the issue, restarting the computer should.
 
 ## `Node` & `Yarn`
 

docs/specs/zk_evm/bootloader.md

@@ -174,7 +174,7 @@ bootloader’s memory, the array of the transactions is not passed as the ABI-en
 struct BootloaderTxDescription {
   // The offset by which the ABI-encoded transaction's data is stored
   uint256 txDataOffset;
-  // Auxilary data on the transaction's execution. In our internal versions
+  // Auxiliary data on the transaction's execution. In our internal versions
   // of the bootloader it may have some special meaning, but for the
   // bootloader used on the mainnet it has only one meaning: whether to execute
   // the transaction. If 0, no more transactions should be executed. If 1, then