From 29c852cfcfb832fcb292e55f2f95e4952e9daa41 Mon Sep 17 00:00:00 2001 From: Doll <148654386+Dollyerls@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:42:54 +0800 Subject: [PATCH 1/5] Merge branch 'main' into main --- docs/advanced/zk_intuition.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/advanced/zk_intuition.md b/docs/advanced/zk_intuition.md index 16c32dd6762b..5253199ca36c 100644 --- a/docs/advanced/zk_intuition.md +++ b/docs/advanced/zk_intuition.md @@ -138,7 +138,7 @@ this guide was written, the latest version was 1.3.4, but there was also ongoing version 1.4.0. [witness_example]: - https://github.com/matter-labs/zkevm_test_harness/blob/0c17bc7baa4e0b64634d414942ef4200d8613bbd/src/witness/individual_circuits/decommit_code.rs#L23 + https://github.com/matter-labs/era-zkevm_test_harness/blob/0c17bc7baa4e0b64634d414942ef4200d8613bbd/src/witness/individual_circuits/decommit_code.rs#L23 [verifier]: https://github.com/matter-labs/zksync-2-contracts/blob/d9785355518edc7f686fb2c91ff7d1caced9f9b8/ethereum/contracts/zksync/Plonk4VerifierWithAccessToDNext.sol#L284 [bellman repo]: https://github.com/matter-labs/bellman From d7d4abb10986ff2657624c225f5b76e5a0add9c5 Mon Sep 17 00:00:00 2001 From: Doll <148654386+Dollyerls@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:44:21 +0800 Subject: [PATCH 2/5] Merge branch 'main' into main --- docs/advanced/zk_intuition.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/advanced/zk_intuition.md b/docs/advanced/zk_intuition.md index 5253199ca36c..6a74c404cd9e 100644 --- a/docs/advanced/zk_intuition.md +++ b/docs/advanced/zk_intuition.md @@ -138,7 +138,7 @@ this guide was written, the latest version was 1.3.4, but there was also ongoing version 1.4.0. [witness_example]: - https://github.com/matter-labs/era-zkevm_test_harness/blob/0c17bc7baa4e0b64634d414942ef4200d8613bbd/src/witness/individual_circuits/decommit_code.rs#L23 + https://github.com/matter-labs/era-zkevm_test_harness/blob/0c17bc7baa4e0b64634d414942ef4200d8613bbd/src/witness/individual_circuits/decommit_code.rs#L24 [verifier]: https://github.com/matter-labs/zksync-2-contracts/blob/d9785355518edc7f686fb2c91ff7d1caced9f9b8/ethereum/contracts/zksync/Plonk4VerifierWithAccessToDNext.sol#L284 [bellman repo]: https://github.com/matter-labs/bellman From 1af46bb1236c744f66407762d549461db0dace3d Mon Sep 17 00:00:00 2001 From: Doll <148654386+Dollyerls@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:49:13 +0800 Subject: [PATCH 3/5] chore: Update docs --- docs/advanced/zk_intuition.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/advanced/zk_intuition.md b/docs/advanced/zk_intuition.md index 6a74c404cd9e..f29d03991eec 100644 --- a/docs/advanced/zk_intuition.md +++ b/docs/advanced/zk_intuition.md @@ -138,7 +138,7 @@ this guide was written, the latest version was 1.3.4, but there was also ongoing version 1.4.0. [witness_example]: - https://github.com/matter-labs/era-zkevm_test_harness/blob/0c17bc7baa4e0b64634d414942ef4200d8613bbd/src/witness/individual_circuits/decommit_code.rs#L24 + https://github.com/matter-labs/era-zkevm_test_harness/tree/main/src/witness/individual_circuits/decommit_code.rs#L24 [verifier]: https://github.com/matter-labs/zksync-2-contracts/blob/d9785355518edc7f686fb2c91ff7d1caced9f9b8/ethereum/contracts/zksync/Plonk4VerifierWithAccessToDNext.sol#L284 [bellman repo]: https://github.com/matter-labs/bellman From 2841e1284d6bcf9707a4e0c0e6fc1768ced2072f Mon Sep 17 00:00:00 2001 From: Doll <148654386+Dollyerls@users.noreply.github.com> Date: Tue, 14 Nov 2023 01:37:58 +0800 Subject: [PATCH 4/5] chore: fixed typo chore: fixed typo --- core/tests/ts-integration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tests/ts-integration/README.md b/core/tests/ts-integration/README.md index b3707cac664f..5b34bd7ac02e 100644 --- a/core/tests/ts-integration/README.md +++ b/core/tests/ts-integration/README.md @@ -134,7 +134,7 @@ finalization: it make take several hours to generate a proof and send it onchain Because of that, framework supports "fast" and "long" modes. `TestMaster` objects have `isFastMode` method to determine which mode is currently being used. -If you're going to write a test that can make test run duration longer, it is adviced to guard the "long" part with the +If you're going to write a test that can make test run duration longer, it is advised to guard the "long" part with the corresponding check. By default, "long" mode is assumed, and to enable the "fast" mode one must set the `ZK_INTEGRATION_TESTS_FAST_MODE` From 224b97af2dba6a4047fc728a48d94cf0ebbf9015 Mon Sep 17 00:00:00 2001 From: Doll <148654386+Dollyerls@users.noreply.github.com> Date: Tue, 5 Dec 2023 06:49:27 +0800 Subject: [PATCH 5/5] chore(docs): updated bytecode_compression documentation chore(docs): updated bytecode_compression documentation --- docs/advanced/bytecode_compression.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/advanced/bytecode_compression.md b/docs/advanced/bytecode_compression.md index 2c9e42acd5d6..0742da6db80c 100644 --- a/docs/advanced/bytecode_compression.md +++ b/docs/advanced/bytecode_compression.md @@ -2,7 +2,7 @@ ## Overview -As we are a rollup - all the bytecodes that contracts use in our chain must be copied into L1 (so that the chain can be +As we are a rollup - all the bytecodes that contracts used in our chain must be copied into L1 (so that the chain can be reconstructed from L1 if needed). Given the want/need to cutdown on space used, bytecode is compressed prior to being posted to L1. At a high level @@ -31,7 +31,7 @@ Dictionary would be: 3 -> 0xC (count: 1) ``` -Note that '1' maps to '0xD', as it occurs twice, and first occurrence is earlier than first occurrence of 0xB, that also +Note that '1' maps to '0xD', as it occurs twice, and first occurrence is earlier than first occurence of 0xB, that also occurs twice. Compressed bytecode: @@ -99,10 +99,10 @@ with no change to the underlying algorithm. ### Verification & Publication The function `publishCompressBytecode` takes in both the original `_bytecode` and the `_rawCompressedData` , the latter -of which comes from the output of the server’s compression algorithm. Looping over the encoded data, derived from -`_rawCompressedData` , the corresponding chunks are pulled from the dictionary and compared to the original byte code, -reverting if there is a mismatch. After the encoded data has been verified, it is published to L1 and marked accordingly -within the `KnownCodesStorage` contract. +of which comes from the server’s compression algorithm output. Looping over the encoded data, derived from +`_rawCompressedData` , the corresponding chunks are retrieved from the dictionary and compared to the original byte +code, reverting if there is a mismatch. After the encoded data has been verified, it is published to L1 and marked +accordingly within the `KnownCodesStorage` contract. Pseudo-code implementation: