resolve conflicts

.github/pull_request_template.md

@@ -18,4 +18,3 @@
 - [ ] Tests for the changes have been added / updated.
 - [ ] Documentation comments have been added / updated.
 - [ ] Code has been formatted via `zk fmt` and `zk lint`.
-- [ ] Spellcheck has been run via `zk spellcheck`.

.github/workflows/build-contract-verifier-template.yml

@@ -138,7 +138,7 @@ jobs:
           COMPONENT: ${{ matrix.components }}
           PLATFORM: ${{ matrix.platforms }}
         run: |
-          ci_run rustup default nightly-2024-05-07
+          ci_run run_retried rustup default nightly-2024-05-07
           platform=$(echo $PLATFORM | tr '/' '-')
           ci_run zk docker $DOCKER_ACTION --custom-tag=${IMAGE_TAG_SUFFIX} --platform=${PLATFORM} $COMPONENT
       - name: Show sccache stats

.github/workflows/build-core-template.yml

@@ -147,7 +147,7 @@ jobs:
           COMPONENT: ${{ matrix.components }}
           PLATFORM: ${{ matrix.platforms }}
         run: |
-          ci_run rustup default nightly-2024-05-07
+          ci_run run_retried rustup default nightly-2024-05-07
           platform=$(echo $PLATFORM | tr '/' '-')
           ci_run zk docker $DOCKER_ACTION --custom-tag=${IMAGE_TAG_SUFFIX} --platform=${PLATFORM} $COMPONENT
       - name: Show sccache stats

.github/workflows/ci-common-reusable.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       # This does both linting and "building". We're using `zk lint prover` as it's common practice within our repo

.github/workflows/ci-core-lint-reusable.yml

@@ -28,6 +28,7 @@ jobs:
       - name: Setup db
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db migrate
 
       - name: Lints

.github/workflows/ci-core-reusable.yml

@@ -53,6 +53,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk run yarn
           ci_run zk db setup
           ci_run zk compiler all
@@ -192,6 +193,7 @@ jobs:
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts
           ci_run zk
+          ci_run run_retried rustup show
           if [[ "${{ matrix.deployment_mode }}" == "Validium" ]]; then
             ci_run zk env dev_validium_docker
             ci_run zk config compile dev_validium_docker
@@ -203,7 +205,7 @@ jobs:
       # `sleep 5` because we need to wait until server started properly
       - name: Run server
         run: |
-          ci_run zk server --use-node-framework --components=$SERVER_COMPONENTS &>server.log &
+          ci_run zk server --components=$SERVER_COMPONENTS &>server.log &
           ci_run sleep 5
 
       - name: Run contract verifier
@@ -337,6 +339,7 @@ jobs:
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts
           ci_run zk
+          ci_run run_retried rustup show
           if [[ "${{ matrix.deployment_mode }}" == "Rollup" ]]; then
             ci_run zk config compile
           elif [[ "${{ matrix.deployment_mode }}" == "Validium" ]]; then

.github/workflows/ci-prover-reusable.yml

@@ -60,6 +60,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       - name: Prover unit tests

.github/workflows/ci-zk-toolbox-reusable.yml

@@ -28,6 +28,7 @@ jobs:
       - name: Start services
         run: |
           ci_localnet_up
+          ci_run sccache --start-server
 
       - name: Build
         run: |
@@ -75,6 +76,7 @@ jobs:
       - name: Start services
         run: |
           ci_localnet_up
+          ci_run sccache --start-server
 
       - name: Initialize ecosystem
         run: |
@@ -88,7 +90,7 @@ jobs:
 
       - name: Run server
         run: |
-          ci_run zk_inception server --ignore-prerequisites &>server.log &
+          ci_run zk_inception server --ignore-prerequisites -a --verbose &>server.log &
           ci_run sleep 5
 
       - name: Run integration tests

.github/workflows/ci.yml

@@ -157,7 +157,7 @@ jobs:
     name: Github Status Check
     runs-on: ubuntu-latest
     if: always() && !cancelled()
-    needs: [ci-for-core-lint, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images]
+    needs: [ci-for-core-lint, ci-for-common, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images]
     steps:
       - name: Status
         run: |

CONTRIBUTING.md

@@ -40,7 +40,7 @@ We aim to make it as easy as possible to contribute to the mission. This is stil
 and suggestions here too. Some resources to help:
 
 1. [In-repo docs aimed at developers](docs)
-2. [zkSync Era docs!](https://docs.zksync.io)
+2. [ZKsync Era docs!](https://docs.zksync.io)
 3. Company links can be found in the [repositories' readme](README.md)
 
 ## Code of Conduct
@@ -52,8 +52,6 @@ Be polite and respectful.
 **Q**: I have a small contribution that's not getting traction/being merged?
 
 **A**: Due to capacity, contributions that are simple renames of variables or stylistic/minor text improvements, one-off
-typo fix will not be merged. If you do find any typos or grammar errors, the preferred avenue is to improve the existing
-spellchecker. Given you have no technical prowess to do so, please create an issue. Please note that issues will be
-resolved on a best effort basis.
+typo fix will not be merged.
 
 ### Thank you