ci: finalize ci for sync layer stable (#3451)

StanislavBreadless · perekopskiy · web-flow · commit aaa7f03cfe4a · 2025-01-13T17:48:47.000+02:00
## What ❔

&lt;!-- What are the changes this PR brings about? --&gt;
&lt;!-- Example: This PR adds a PR template to the repo. --&gt;
&lt;!-- (For bigger PRs adding more context is appreciated) --&gt;

## Why ❔

&lt;!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? --&gt;
&lt;!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. --&gt;

## Checklist

&lt;!-- Check your PR fulfills the following items. --&gt;
&lt;!-- For draft PRs check the boxes as you complete them. --&gt;

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.

---------

Co-authored-by: perekopskiy &lt;mikeson.dp@gmail.com&gt;
diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
@@ -171,13 +171,22 @@ jobs:
 
   integration-tests:
     runs-on: [ matterlabs-ci-runner-ultra-performance ]
+    strategy:
+      # ----------------------------------------------
+      # Note, that while the contracts do support gateway chain
+      # in reality it won't exist for quite some time and so
+      # we will test both cases here
+      # ----------------------------------------------
+      matrix:
+        use_gateway_chain: [ "WITH_GATEWAY", "WITHOUT_GATEWAY" ]
+      # In some cases it's useful to continue one job even if another fails.
+      fail-fast: false
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
           fetch-depth: 0
 
-
       - name: Setup environment
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
@@ -357,7 +366,11 @@ jobs:
           CHAINS="era,validium,custom_token,consensus"
           echo "CHAINS=$CHAINS" >> $GITHUB_ENV
 
+      # ----------------------------------------------------------------
+      #  Only create/initialize the gateway chain *if* use_gateway_chain=WITH_GATEWAY
+      # ----------------------------------------------------------------
       - name: Initialize gateway chain
+        if: matrix.use_gateway_chain == 'WITH_GATEWAY'
         run: |
           ci_run zkstack chain create \
           --chain-name gateway \
@@ -383,22 +396,26 @@ jobs:
           ci_run zkstack chain convert-to-gateway --chain gateway --ignore-prerequisites
 
       - name: Run gateway
+        if: matrix.use_gateway_chain == 'WITH_GATEWAY'
         run: |
           ci_run zkstack server --ignore-prerequisites --chain gateway &> ${{ env.SERVER_LOGS_DIR }}/gateway.log &
           ci_run zkstack server wait --ignore-prerequisites --verbose --chain gateway
 
       - name: Migrate chains to gateway
+        if: matrix.use_gateway_chain == 'WITH_GATEWAY'
         run: |
           ci_run zkstack chain migrate-to-gateway --chain era --gateway-chain-name gateway
           ci_run zkstack chain migrate-to-gateway --chain validium --gateway-chain-name gateway
           ci_run zkstack chain migrate-to-gateway --chain custom_token --gateway-chain-name gateway
           ci_run zkstack chain migrate-to-gateway --chain consensus --gateway-chain-name gateway
 
       - name: Migrate back era
+        if: matrix.use_gateway_chain == 'WITH_GATEWAY'
         run: |
           ci_run zkstack chain migrate-from-gateway --chain era --gateway-chain-name gateway
 
       - name: Migrate to gateway again
+        if: matrix.use_gateway_chain == 'WITH_GATEWAY'
         run: |
           ci_run zkstack chain migrate-to-gateway --chain era --gateway-chain-name gateway
 
@@ -447,20 +464,22 @@ jobs:
 
       - name: Init external nodes
         run: |
+          GATEWAY_RPC_URL="${{ matrix.use_gateway_chain == 'WITH_GATEWAY' && '--gateway-rpc-url=http://localhost:3550' || '' }}"
+          
           ci_run zkstack external-node configs --db-url=postgres://postgres:notsecurepassword@localhost:5432 \
-          --db-name=zksync_en_localhost_era_rollup --l1-rpc-url=http://localhost:8545 --gateway-rpc-url=http://localhost:3550 --chain era
+          --db-name=zksync_en_localhost_era_rollup --l1-rpc-url=http://localhost:8545 $GATEWAY_RPC_URL --chain era
           ci_run zkstack external-node init --ignore-prerequisites --chain era
 
           ci_run zkstack external-node configs --db-url=postgres://postgres:notsecurepassword@localhost:5432 \
-          --db-name=zksync_en_localhost_era_validium1 --l1-rpc-url=http://localhost:8545 --gateway-rpc-url=http://localhost:3550 --chain validium
+          --db-name=zksync_en_localhost_era_validium1 --l1-rpc-url=http://localhost:8545 $GATEWAY_RPC_URL --chain validium
           ci_run zkstack external-node init --ignore-prerequisites --chain validium
 
           ci_run zkstack external-node configs --db-url=postgres://postgres:notsecurepassword@localhost:5432 \
-          --db-name=zksync_en_localhost_era_custom_token --l1-rpc-url=http://localhost:8545 --gateway-rpc-url=http://localhost:3550 --chain custom_token
+          --db-name=zksync_en_localhost_era_custom_token --l1-rpc-url=http://localhost:8545 $GATEWAY_RPC_URL --chain custom_token
           ci_run zkstack external-node init --ignore-prerequisites --chain custom_token
 
           ci_run zkstack external-node configs --db-url=postgres://postgres:notsecurepassword@localhost:5432 \
-          --db-name=zksync_en_localhost_era_consensus --l1-rpc-url=http://localhost:8545 --gateway-rpc-url=http://localhost:3550 --chain consensus
+          --db-name=zksync_en_localhost_era_consensus --l1-rpc-url=http://localhost:8545 $GATEWAY_RPC_URL --chain consensus
           ci_run zkstack external-node init --ignore-prerequisites --chain consensus
 
       - name: Run recovery tests (from snapshot)
@@ -490,17 +509,28 @@ jobs:
       - name: Fee projection tests
         run: |
           ci_run killall -INT zksync_server || true
-          ci_run zkstack server --ignore-prerequisites --chain gateway &> ${{ env.SERVER_LOGS_DIR }}/gateway.log &
-          ci_run zkstack server wait --ignore-prerequisites --verbose --chain gateway
+
+          # Only start & wait for the gateway server if use_gateway_chain == WITH_GATEWAY
+          if [ "${{ matrix.use_gateway_chain }}" == "WITH_GATEWAY" ]; then
+            ci_run zkstack server --ignore-prerequisites --chain gateway &> ${{ env.SERVER_LOGS_DIR }}/gateway.log &
+            ci_run zkstack server wait --ignore-prerequisites --verbose --chain gateway
+          fi
+
+          # Always run the chain-specific fee tests
           ci_run ./bin/run_on_all_chains.sh "zkstack dev test fees --no-deps --no-kill" ${{ env.CHAINS }} ${{ env.FEES_LOGS_DIR }}
 
       - name: Run revert tests
         run: |
           ci_run killall -INT zksync_server || true
           ci_run killall -INT zksync_external_node || true
-          ci_run zkstack server --ignore-prerequisites --chain gateway &> ${{ env.SERVER_LOGS_DIR }}/gateway.log &
-          ci_run zkstack server wait --ignore-prerequisites --verbose --chain gateway
 
+          # Only start & wait for the gateway server if use_gateway_chain == WITH_GATEWAY
+          if [ "${{ matrix.use_gateway_chain }}" == "WITH_GATEWAY" ]; then
+            ci_run zkstack server --ignore-prerequisites --chain gateway &> ${{ env.SERVER_LOGS_DIR }}/gateway.log &
+            ci_run zkstack server wait --ignore-prerequisites --verbose --chain gateway
+          fi
+
+          # Always run the chain-specific revert tests
           ci_run ./bin/run_on_all_chains.sh "zkstack dev test revert --no-deps --external-node --no-kill --ignore-prerequisites" ${{ env.CHAINS }} ${{ env.INTEGRATION_TESTS_LOGS_DIR }}
 
       # Upgrade tests should run last, because as soon as they
@@ -509,13 +539,19 @@ jobs:
       - name: Run upgrade test
         run: |
           ci_run killall -INT zksync_server || true
-          ci_run zkstack server --ignore-prerequisites --chain gateway &> ${{ env.SERVER_LOGS_DIR }}/gateway.log &
-          ci_run zkstack server wait --ignore-prerequisites --verbose --chain gateway
+
+          # Only start & wait for the gateway server if use_gateway_chain == WITH_GATEWAY
+          if [ "${{ matrix.use_gateway_chain }}" == "WITH_GATEWAY" ]; then
+            ci_run zkstack server --ignore-prerequisites --chain gateway &> ${{ env.SERVER_LOGS_DIR }}/gateway.log &
+            ci_run zkstack server wait --ignore-prerequisites --verbose --chain gateway
+          fi
+
+          # Always run the upgrade test against era
           ci_run zkstack dev test upgrade --no-deps --chain era
 
       - name: Upload logs
         uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: always()
         with:
-          name: logs
+          name: logs_${{matrix.use_gateway_chain}}
           path: logs
diff --git a/.github/workflows/ci-prover-e2e.yml b/.github/workflows/ci-prover-e2e.yml
@@ -43,10 +43,19 @@ jobs:
         run: |
           git fetch
           # Checkout the commit with the DualVerifier contract to test FFLONK interface
-          git checkout b4d5b984
+          git checkout b68a01afa494fbb2fe85c954f0afe0d36ef589ca
           git submodule update --init --recursive
           git rev-parse HEAD
 
+      - name: Set new genesis for fflonk 
+        # Note, that while `Verifier` is not explicitly a part of the genensis state,
+        # it affects it indirectly as it is a part of the repo.
+        working-directory: ./etc/env/file_based
+        if: matrix.compressor-mode == 'fflonk'
+        run: |
+          sudo sed -i 's/^genesis_root: .*/genesis_root: 0x596bdde3d20c57b7e1bc63dfa094c0824a82a7f11eba1658d2399c9b29216c97/' genesis.yaml
+          sudo sed -i "s/^genesis_batch_commitment: .*/genesis_batch_commitment: 0xa3ceee53a25ae7438d7144d3cf151d25638b866cdacc51226b04380ed8aa8bbe/" genesis.yaml
+
       - name: Init
         run: |
           ci_run chmod -R +x ./bin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -96,11 +96,11 @@ jobs:
     name: CI for Prover Components
     uses: ./.github/workflows/ci-prover-reusable.yml
 
-#  e2e-for-prover:
-#    name: E2E Test for Prover Components
-#    needs: changed_files
-#    if: ${{(needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
-#    uses: ./.github/workflows/ci-prover-e2e.yml
+  e2e-for-prover:
+    name: E2E Test for Prover Components
+    needs: changed_files
+    if: ${{(needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
+    uses: ./.github/workflows/ci-prover-e2e.yml
 
   ci-for-docs:
     needs: changed_files
@@ -184,7 +184,7 @@ jobs:
     name: Github Status Check
     runs-on: ubuntu-latest
     if: always() && !cancelled()
-    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 ]
+    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, e2e-for-prover ]
     steps:
       - name: Status
         run: |
diff --git a/contracts b/contracts
@@ -1 +1 @@
-Subproject commit c39ab94b91f07fab8fd0d790af2d208ac3ee70f8
+Subproject commit 2cc0621acf3ccd0536bfd01999727753d1447931
diff --git a/core/lib/l1_contract_interface/src/i_executor/methods/prove_batches.rs b/core/lib/l1_contract_interface/src/i_executor/methods/prove_batches.rs
@@ -58,8 +58,10 @@ impl ProveBatches {
                 }
             };
 
+            let should_use_fflonk = !is_verifier_pre_fflonk || !protocol_version.is_pre_fflonk();
+
             if protocol_version.is_pre_gateway() {
-                let proof_input = if !is_verifier_pre_fflonk || !protocol_version.is_pre_fflonk() {
+                let proof_input = if should_use_fflonk {
                     Token::Tuple(vec![
                         Token::Array(vec![verifier_type.into_token()]),
                         Token::Array(proof.into_iter().map(Token::Uint).collect()),
@@ -73,7 +75,17 @@ impl ProveBatches {
 
                 vec![prev_l1_batch_info, batches_arg, proof_input]
             } else {
-                let proof_input = Token::Array(proof.into_iter().map(Token::Uint).collect());
+                let proof_input = if should_use_fflonk {
+                    Token::Array(
+                        vec![verifier_type]
+                            .into_iter()
+                            .chain(proof)
+                            .map(Token::Uint)
+                            .collect(),
+                    )
+                } else {
+                    Token::Array(proof.into_iter().map(Token::Uint).collect())
+                };
 
                 let encoded_data = encode(&[prev_l1_batch_info, batches_arg, proof_input]);
                 let prove_data = [[SUPPORTED_ENCODING_VERSION].to_vec(), encoded_data]
diff --git a/core/tests/ts-integration/tests/base-token.test.ts b/core/tests/ts-integration/tests/base-token.test.ts
@@ -78,7 +78,7 @@ describe('base ERC20 contract checks', () => {
         // TODO: should all the following tests use strict equality?
 
         const finalEthBalance = await alice.getBalanceL1();
-        expect(initialEthBalance).toBeGreaterThan(finalEthBalance + fee); // Fee should be taken from the ETH balance on L1.
+        expect(initialEthBalance).toBeGreaterThanOrEqual(finalEthBalance + fee); // Fee should be taken from the ETH balance on L1.
 
         const finalL1Balance = await alice.getBalanceL1(baseTokenDetails.l1Address);
         expect(initialL1Balance).toBeGreaterThanOrEqual(finalL1Balance + amount);
diff --git a/core/tests/upgrade-test/tests/upgrade.test.ts b/core/tests/upgrade-test/tests/upgrade.test.ts
@@ -349,11 +349,18 @@ describe('Upgrade test', function () {
         );
 
         console.log('Sending chain admin operation');
-        await sendChainAdminOperation({
-            target: await slChainAdminContract.getAddress(),
-            data: setTimestampCalldata,
-            value: 0
-        });
+        // Different chain admin impls are used depending on whether gateway is used.
+        if (gatewayInfo) {
+            // ChainAdmin.sol: `setUpgradeTimestamp` has onlySelf so we do multicall.
+            await sendChainAdminOperation({
+                target: await slChainAdminContract.getAddress(),
+                data: setTimestampCalldata,
+                value: 0
+            });
+        } else {
+            // ChainAdminOwnable.sol: `setUpgradeTimestamp` has onlyOwner so we call it directly.
+            await chainAdminSetTimestamp(setTimestampCalldata);
+        }
 
         // Wait for server to process L1 event.
         await utils.sleep(2);
@@ -458,6 +465,17 @@ describe('Upgrade test', function () {
         console.log('Transaction complete!');
     }
 
+    async function chainAdminSetTimestamp(data: string) {
+        const transaction = await slAdminGovWallet.sendTransaction({
+            to: await slChainAdminContract.getAddress(),
+            data,
+            type: 0
+        });
+        console.log(`Sent chain admin operation, tx_hash=${transaction.hash}, nonce=${transaction.nonce}`);
+        await transaction.wait();
+        console.log(`Chain admin operation succeeded, tx_hash=${transaction.hash}`);
+    }
+
     async function sendChainAdminOperation(call: Call) {
         const executeMulticallData = slChainAdminContract.interface.encodeFunctionData('multicall', [[call], true]);
 
