Merge pull request #11193 from starkware-libs/itay/merge-main-v0.14.1-into-main-v0.14.1-committer-1766912996

Itay/merge main v0.14.1 into main v0.14.1 committer 1766912996

Author: dorimedini-starkware

.config/nextest.toml

@@ -0,0 +1,16 @@
+[profile.default]
+slow-timeout = { period = "60s", terminate-after = 2 }
+
+[test-groups.serialized]
+max-threads = 1
+
+# serialized tests (mostly integration tests)
+[[profile.default.overrides]]
+# TODO(victork): evaluate whether these are indeed required to run sequentially
+filter = '(package(apollo_integration_tests) & kind(test)) | package(apollo_infra) | package(apollo_network) | (package(apollo_l1_provider) & kind(test))'
+test-group = 'serialized'
+
+# slow test exception whitelist
+[[profile.default.overrides]]
+filter = 'none()'
+slow-timeout = { period = "120s", terminate-after = 2 }

.github/actions/install_rust/action.yml

@@ -17,7 +17,7 @@ runs:
       with:
         cache-base: main(-v[0-9].*)?
         inherit-toolchain: true
-        bins: taplo-cli@0.9.3, cargo-machete
+        bins: taplo-cli@0.9.3, cargo-machete, cargo-nextest@0.9.113
         # Install additional non-default toolchains (for rustfmt for example), NOP if input omitted.
         channel: ${{ inputs.extra_rust_toolchains }}
       env:

…ithub/workflows/hybrid_system_test2.yaml .github/workflows/hybrid_system_test.yaml.github/workflows/hybrid_system_test2.yaml renamed to .github/workflows/hybrid_system_test.yaml .github/workflows/hybrid_system_test2.yaml renamed to .github/workflows/hybrid_system_test.yaml

@@ -1,4 +1,4 @@
-name: Sequencer - Hybrid Node System Test 2
+name: Sequencer - Hybrid Node System Test
 
 on:
   workflow_dispatch:
@@ -18,7 +18,7 @@ env:
   overlay: hybrid.testing.node-0
   cluster_name: hybrid-system-test
   crate_triggers: "apollo_node,apollo_deployments,apollo_integration_tests"
-  path_triggers: ".github/workflows/hybrid_system_test.yaml,scripts/*.py,scripts/system_tests/**/*.py,deployments/sequencer/**"
+  path_triggers: ".github/workflows/hybrid_system_test.yaml,scripts/*.py,scripts/system_tests/**/*.py,deployments/sequencer/**,deployments/images/**"
   path_triggers_exclude: "scripts/prod/**/*"
   pvc_storage_class_name: "premium-rwo"
   anvil_port: "8545"
@@ -278,15 +278,15 @@ jobs:
         run: ./target/debug/sequencer_node_setup --output-base-dir ./output --data-prefix-path /data --n-consolidated 1 --n-hybrid 0 --n-distributed 0
 
       - name: Generate k8s manifests
-        working-directory: deployments/sequencer2
+        working-directory: deployments/sequencer
         run: |
           pipenv install
           cdk8s import
           echo "Generating Kubernetes manifests using hybrid layout"
           cdk8s synth --app "pipenv run python main.py --namespace ${{ env.namespace }} -l ${{ env.layout }} -o ${{ env.overlay }} --image ${{ env.NSC_CONTAINER_REGISTRY }}/sequencer:${{ github.sha }}"
 
       - name: Deploy Sequencer
-        working-directory: deployments/sequencer2
+        working-directory: deployments/sequencer
         run: |
           echo "Deploying Sequencer..."
           kubectl create namespace ${{ env.namespace }}
@@ -296,22 +296,26 @@ jobs:
         run: kubectl config set-context --current --namespace ${{ env.namespace }}
 
       - name: Run readiness check
-        run: pipenv run python ./scripts/system_tests/readiness_check2.py --layout ${{ env.layout }} --namespace ${{ env.namespace }}
+        run: pipenv run python ./scripts/system_tests/readiness_check.py --layout ${{ env.layout }} --overlay ${{ env.overlay }} --namespace ${{ env.namespace }}
 
       - name: Test sequencer is alive
         env:
           initial_delay_sec: 10
           check_interval_sec: 2
           check_timeout_sec: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.liveness_test_duration_sec || 10 }}
         run: |
-          pipenv run python ./scripts/system_tests/liveness_check2.py \
+          pipenv run python ./scripts/system_tests/liveness_check.py \
             --namespace ${{ env.namespace }} \
             --layout ${{ env.layout }} \
+            --overlay ${{ env.overlay }} \
             --timeout ${{ env.check_timeout_sec }} \
             --interval ${{ env.check_interval_sec }}
 
       - name: Copy state and restart pod
-        run: pipenv run python ./scripts/system_tests/copy_state_and_restart2.py --layout ${{ env.layout }} --namespace ${{ env.namespace }} --data-dir "./output/data/node_0"
+        run: pipenv run python ./scripts/system_tests/copy_state_and_restart.py --layout ${{ env.layout }} --overlay ${{ env.overlay }} --namespace ${{ env.namespace }} --data-dir "./output/data/node_0"
+
+      - name: Run readiness check
+        run: pipenv run python ./scripts/system_tests/readiness_check.py --layout ${{ env.layout }} --overlay ${{ env.overlay }} --namespace ${{ env.namespace }}
 
       - name: Port-forward Anvil pod to localhost:${{ env.anvil_port }}
         run: |
@@ -335,7 +339,7 @@ jobs:
         env:
           RUST_LOG: debug
           RUST_BACKTRACE: full
-        run: pipenv run python ./scripts/system_tests/sequencer_simulator2.py --state_sync_monitoring_endpoint_port 8082 --http_server_port 8080 --node_type "hybrid" --sender_address "${{ env.SENDER_ADDRESS }}" --receiver_address "${{ env.RECEIVER_ADDRESS }}"
+        run: pipenv run python ./scripts/system_tests/sequencer_simulator.py --state_sync_monitoring_endpoint_port 8082 --http_server_port 8080 --node_type "hybrid" --sender_address "${{ env.SENDER_ADDRESS }}" --receiver_address "${{ env.RECEIVER_ADDRESS }}"
 
       - name: List all pods in namespace ${{ env.namespace }}
         if: always()

.github/workflows/sequencer_cdk8s-test.yml

@@ -9,7 +9,7 @@ on:
     paths:
       - ".github/workflows/sequencer_cdk8s-test.yml"
       - "crates/apollo_deployments/**"
-      - "deployments/sequencer2/**"
+      - "deployments/sequencer/**"
 
 jobs:
   prepare:
@@ -19,8 +19,9 @@ jobs:
       namespace: test
       layout: hybrid
       overlay: hybrid.testing.node-0
+      overlay2: hybrid.testing.all-constructs
       monitoring_dashboard_file: ${{ github.workspace }}/deployments/monitoring/examples/output/dashboards/sequencer_node_dashboard.json
-      cdk8s_sequencer_path: ${{ github.workspace }}/deployments/sequencer2
+      cdk8s_sequencer_path: ${{ github.workspace }}/deployments/sequencer
 
     steps:
       - name: Checkout sequencer
@@ -47,23 +48,30 @@ jobs:
       - name: CDk8s synth
         working-directory: ${{ env.cdk8s_sequencer_path }}
         run: |
+          echo "Importing CDK8s Sequencer app..."
           cdk8s import
+          echo "Installing pip dependencies..."
           pipenv install
-          cdk8s synth --app "pipenv run python -m main --namespace ${{ env.namespace }} -l ${{ env.layout }} -o ${{ env.overlay }} --monitoring-dashboard-file ${{ env.monitoring_dashboard_file }} --cluster ${{ env.cluster }}"
+          echo "Synthesizing CDK8s Sequencer app with overlay ${{ env.overlay }}..."
+          cdk8s synth --app "pipenv run python -m main --namespace ${{ env.namespace }} -l ${{ env.layout }} -o ${{ env.overlay }} --monitoring-dashboard-file ${{ env.monitoring_dashboard_file }} --cluster ${{ env.cluster }}" --output dist1
+          echo "Synthesizing CDK8s Sequencer app with overlay ${{ env.overlay2 }}..."
+          cdk8s synth --app "pipenv run python -m main --namespace ${{ env.namespace }} -l ${{ env.layout }} -o ${{ env.overlay2 }} --monitoring-dashboard-file ${{ env.monitoring_dashboard_file }} --cluster ${{ env.cluster }}" --output dist2
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: cdk8s-artifacts
           path: |
-            ${{ env.cdk8s_sequencer_path }}/dist
+            ${{ env.cdk8s_sequencer_path }}/dist1
+            ${{ env.cdk8s_sequencer_path }}/dist2
             ${{ env.cdk8s_sequencer_path }}/resources
 
   validate:
     runs-on: ubuntu-24.04
     needs: prepare
     env:
-      dist_path: ./cdk8s-artifacts/dist
+      dist1_path: ./cdk8s-artifacts/dist1
+      dist2_path: ./cdk8s-artifacts/dist2
       crds_path: ./cdk8s-artifacts/resources/crds
     steps:
       - name: Setup go lang
@@ -82,25 +90,29 @@ jobs:
           merge-multiple: true
 
       - name: kubectl validation test for version 1.27
-        run: kubectl validate ${{ env.dist_path }} --local-crds ${{ env.crds_path }} --version 1.27
+        run: kubectl validate ${{ env.dist1_path }} ${{ env.dist2_path }} --local-crds ${{ env.crds_path }} --version 1.27
         continue-on-error: true
 
       - name: kubectl validation test for version 1.28
-        run: kubectl validate ${{ env.dist_path }} --local-crds ${{ env.crds_path }} --version 1.28
+        run: kubectl validate ${{ env.dist1_path }} ${{ env.dist2_path }} --local-crds ${{ env.crds_path }} --version 1.28
         continue-on-error: true
 
       - name: kubectl validation test for version 1.29
-        run: kubectl validate ${{ env.dist_path }} --local-crds ${{ env.crds_path }} --version 1.29
+        run: kubectl validate ${{ env.dist1_path }} ${{ env.dist2_path }} --local-crds ${{ env.crds_path }} --version 1.29
         continue-on-error: false
 
       - name: kubectl validation test for version 1.30
-        run: kubectl validate ${{ env.dist_path }} --local-crds ${{ env.crds_path }} --version 1.30
+        run: kubectl validate ${{ env.dist1_path }} ${{ env.dist2_path }} --local-crds ${{ env.crds_path }} --version 1.30
         continue-on-error: false
 
       - name: kubectl validation test for version 1.31
-        run: kubectl validate ${{ env.dist_path }} --local-crds ${{ env.crds_path }} --version 1.31
+        run: kubectl validate ${{ env.dist1_path }} ${{ env.dist2_path }} --local-crds ${{ env.crds_path }} --version 1.31
         continue-on-error: false
 
       - name: kubectl validation test for version 1.32
-        run: kubectl validate ${{ env.dist_path }} --local-crds ${{ env.crds_path }} --version 1.32
+        run: kubectl validate ${{ env.dist1_path }} ${{ env.dist2_path }} --local-crds ${{ env.crds_path }} --version 1.32
+        continue-on-error: false
+
+      - name: kubectl validation test for version 1.33
+        run: kubectl validate ${{ env.dist1_path }} ${{ env.dist2_path }} --local-crds ${{ env.crds_path }} --version 1.33
         continue-on-error: false

.github/workflows/sequencer_docker-test.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   crate_triggers: "apollo_node,apollo_dashboard,apollo_integration_tests"
-  path_triggers: ".github/workflows/sequencer_docker-test.yml,scripts/*.py,scripts/system_tests/**/*.py"
+  path_triggers: ".github/workflows/sequencer_docker-test.yml,scripts/*.py,scripts/system_tests/**/*.py,deployments/images/**"
   path_triggers_exclude: "scripts/prod/**/*"
 
 permissions:

.gitignore

@@ -38,6 +38,9 @@ __pycache__/
 scripts/__pycache__
 monitoring_venv/
 
+# echonet deploy-time generated bundle for kustomize
+echonet/k8s/echonet/generated/
+
 # Papyrus p2p sync test artifacts.
 scripts/papyrus/p2p_sync_e2e_test/data_client/
 scripts/papyrus/p2p_sync_e2e_test/data_server/

Cargo.lock

@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true
 repository.workspace = true
 license.workspace = true
+description = "Testing utilities for L1 (Ethereum) base layer interactions."
 
 [features]
 
@@ -12,6 +13,7 @@ workspace = true
 
 [dependencies]
 alloy.workspace = true
+apollo_config.workspace = true
 async-trait.workspace = true
 colored.workspace = true
 papyrus_base_layer = { workspace = true, features = ["testing"] }