Update franklin crypto (#2387)

* Update franklin crypto Signed-off-by: Danil <[email protected]> * Update keys Signed-off-by: Danil <[email protected]> * run ci Signed-off-by: Danil <[email protected]> * Run ci from admin bot org repo Signed-off-by: Danil <[email protected]> * Change https to ssh Signed-off-by: Danil <[email protected]> * Fix private clone * https clone * Try enforcing fetching with git cli * Add PAT injection to lints job * Fix init ordering * Update docker images Signed-off-by: Danil <[email protected]> * Migrate to new CI runners * Proper job runners * Build docker container Signed-off-by: Danil <[email protected]> * Build docker with prefetch Signed-off-by: Danil <[email protected]> * Update server versions Signed-off-by: Danil <[email protected]> * Fix deps Signed-off-by: Danil <[email protected]> --------- Signed-off-by: Danil <[email protected]> Co-authored-by: hatemosphere <[email protected]>
ExTopia · Nov 8, 2023 · 5730fa4 · 5730fa4
1 parent 8981557
commit 5730fa4
Show file tree

Hide file tree

Showing 37 changed files with 125 additions and 118 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[net]
+git-fetch-with-cli = true
diff --git a/.dockerignore b/.dockerignore
@@ -25,3 +25,4 @@
 !infrastructure/explorer/dist
 !infrastructure/zk
 !sdk/zksync-rs
+!cargo
diff --git a/.github/workflows/build-data-restore-docker.yml b/.github/workflows/build-data-restore-docker.yml
@@ -33,6 +33,7 @@ jobs:
 
     - name: init
       run: |
+        ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
         ci_run git config --global --add safe.directory /usr/src/zksync
         ci_run git config --global --add safe.directory /usr/src/zksync/sdk/binaryen
         ci_run zk

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,11 +17,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        env:
+          CARGO_NET_GIT_FETCH_WITH_CLI: true
+        with:
+          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - name: setup-env
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> $GITHUB_ENV
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> .env
 
       - name: start-services
         run: |
@@ -34,6 +40,10 @@ jobs:
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
 
+      - name: init
+        run: |
+          ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
+
       - name: lints
         run: |
           ci_run zk
@@ -45,11 +55,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        env:
+          CARGO_NET_GIT_FETCH_WITH_CLI: true
+        with:
+          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - name: setup-env
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> $GITHUB_ENV
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> .env
 
       - name: start-services
         run: |
@@ -60,6 +76,7 @@ jobs:
 
       - name: init
         run: |
+          ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
           ci_run zk
           ci_run zk run plonk-setup
           ci_run zk run yarn
@@ -87,11 +104,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        with:
+          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - name: setup-env
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> $GITHUB_ENV
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> .env
           ## Setup sccache GCS key (update docker-compose .env)
 
       - name: start-services
@@ -103,6 +124,8 @@ jobs:
 
       - name: init
         run: |
+          
+          ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
           ci_run zk
           ci_run zk dummy-prover enable --no-redeploy
           ci_run zk init
@@ -142,15 +165,21 @@ jobs:
           ci_run cat /tmp/sccache_log.txt
 
   circuit-tests:
-    runs-on: [matterlabs-ci-runner]
+    runs-on: [matterlabs-ci-runner-highmem]
 
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        env:
+          CARGO_NET_GIT_FETCH_WITH_CLI: true
+        with:
+          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - name: prepare
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> $GITHUB_ENV
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> .env
 
       - name: start-services
         run: |
@@ -161,6 +190,7 @@ jobs:
 
       - name: init
         run: |
+          ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
           ci_run zk
           ci_run zk run plonk-setup
           ci_run zk run verify-keys unpack
@@ -173,12 +203,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        env:
+          CARGO_NET_GIT_FETCH_WITH_CLI: true
+        with:
+          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - name: prepare
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
           echo PLUGIN_CONFIG=fast >> $GITHUB_ENV # use fast mode for geth image (instant tx commit)
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> $GITHUB_ENV
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> .env
 
       - name: start-services
         run: |
@@ -189,6 +225,7 @@ jobs:
 
       - name: init
         run: |
+          ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
           ci_run zk
           ci_run zk run plonk-setup
           ci_run zk run verify-keys unpack
@@ -202,12 +239,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        env:
+          CARGO_NET_GIT_FETCH_WITH_CLI: true
+        with:
+          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - name: setup-env
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
           ## Setup sccache GCS key (update docker-compose .env)
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> $GITHUB_ENV
+          echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> .env
 
       - name: start-services
         run: |
@@ -218,6 +261,7 @@ jobs:
 
       - name: init
         run: |
+          ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
           ci_run zk
           ci_run zk dummy-prover enable --no-redeploy
           ci_run zk init
@@ -233,7 +277,7 @@ jobs:
 
       - name: loadtest
         run: |
-          ci_run cargo build --release --bin loadnext 
+          ci_run cargo build --release --bin loadnext
           cd $ZKSYNC_HOME
           docker-compose -f docker-compose-runner.yml exec -T -e ALLOWED_PERCENT=20 -e RUST_LOG=loadnext=debug -e ZKSYNC_RPC_ADDR=http://127.0.0.2:3030 -e WEB3_URL=http://geth:8545 -e ETH_NETWORK=localhost -e MASTER_WALLET_PK=74d8b3a188f7260f67698eb44da07397a298df5427df681ef68c45b34b61f998 -e ACCOUNTS_AMOUNT=5 -e OPERATIONS_PER_ACCOUNT=5 -e MAIN_TOKEN=DAI zk ./target/release/loadnext
           docker-compose -f docker-compose-runner.yml exec -T -e ZKSYNC_REST_ADDR=http://127.0.0.2:3001  zk ts-node core/tests/check-block-root-hahes.ts

diff --git a/.github/workflows/deploy.goerli-beta.yml b/.github/workflows/deploy.goerli-beta.yml
@@ -22,6 +22,8 @@ jobs:
         echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
         echo CI=1 >> $GITHUB_ENV
         echo $(pwd)/bin >> $GITHUB_PATH
+        echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> $GITHUB_ENV
+        echo CARGO_NET_GIT_FETCH_WITH_CLI=true >> .env
     -
       name: start-services
       run: |
@@ -30,6 +32,8 @@ jobs:
     -
       name: init
       run: |
+        ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
+        ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/
         ci_run git config --global --add safe.directory /usr/src/zksync
         ci_run git config --global --add safe.directory /usr/src/zksync/sdk/binaryen
         ci_run zk