Merge main-v0.14.0 into main

.github/workflows/consolidated_system_test.yaml

@@ -13,12 +13,13 @@ on:
 
 env:
   job_link: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-  deployment_config_path: ${{ github.workspace }}/crates/apollo_deployments/resources/testing/deployment_configs/deployment_test_consolidated.json
+  deployment_config_path: ${{ github.workspace }}/crates/apollo_deployments/resources/deployments/testing/deployment_config_consolidated.json
   namespace: sequencer-consolidated-system-test-run-${{ github.run_number }}-attempt-${{ github.run_attempt }}
   cluster_name: consolidated-system-test
   crate_triggers: "apollo_node,apollo_deployments,apollo_integration_tests"
   path_triggers: ".github/workflows/consolidated_system_test.yaml,scripts/*.py,scripts/system_tests/**/*.py"
   pvc_storage_class_name: "premium-rwo"
+  anvil_port: "8545"
 
 permissions:
   contents: read
@@ -317,7 +318,22 @@ jobs:
             --interval ${{ env.check_interval_sec }}
 
       - name: Copy state and restart pod
-        run: pipenv run python ./scripts/system_tests/copy_state_and_restart.py --deployment_config_path ${{ env.deployment_config_path }} --data-dir "./output/data/node_0"
+        run: pipenv run python ./scripts/system_tests/copy_state_and_restart.py --deployment_config_path ${{ env.deployment_config_path }} --data-dir "./output/data/node_0/executable_0"
+
+      - name: Port-forward Anvil pod to localhost:${{ env.anvil_port }}
+        run: |
+          echo "🔌 Setting up port-forward to Anvil..."
+
+          ANVIL_POD=$(kubectl get pods -n anvil -l app=anvil -o jsonpath="{.items[0].metadata.name}")
+          echo "🌐 Found Anvil pod: $ANVIL_POD"
+
+          # Start port-forwarding in background and keep it running
+          kubectl port-forward -n anvil "$ANVIL_POD" ${{ env.anvil_port }}:${{ env.anvil_port }} &
+          echo "⏳ Waiting a few seconds to ensure port-forward is established..."
+          sleep 2
+
+      - name: Send transactions test
+        run: pipenv run python ./scripts/system_tests/sequencer_simulator.py --deployment_config_path ${{ env.deployment_config_path }} --config_dir "${{ env.config_dir }}" --node_type "consolidated" --sender_address "${{ env.SENDER_ADDRESS }}" --receiver_address "${{ env.RECEIVER_ADDRESS }}"
 
       - name: Get container logs
         if: always()

.github/workflows/sequencer_cdk8s-test.yml

@@ -26,7 +26,7 @@ jobs:
     env:
       cluster: test
       namespace: test
-      deployment_config_path: ${{ github.workspace }}/crates/apollo_deployments/resources/testing/deployment_configs/deployment_test_consolidated.json
+      deployment_config_path: ${{ github.workspace }}/crates/apollo_deployments/resources/deployments/testing/deployment_config_consolidated.json
       monitoring_dashboard_file: ${{ github.workspace }}/deployments/monitoring/examples/output/dashboards/sequencer_node_dashboard.json
 
     steps:

.github/workflows/sequencer_docker-test.yml

@@ -12,7 +12,7 @@ on:
   pull_request:
 
 env:
-  crate_triggers: "apollo_node,apollo_dashboard"
+  crate_triggers: "apollo_node,apollo_dashboard,apollo_integration_tests"
   path_triggers: ".github/workflows/sequencer_docker-test.yml,scripts/*.py,scripts/system_tests/**/*.py"
 
 permissions:

Cargo.toml

@@ -42,6 +42,7 @@ members = [
   "crates/apollo_node",
   "crates/apollo_p2p_sync",
   "crates/apollo_proc_macros",
+  "crates/apollo_proc_macros_tests",
   "crates/apollo_protobuf",
   "crates/apollo_reverts",
   "crates/apollo_rpc",
@@ -127,7 +128,8 @@ apollo_network.path = "crates/apollo_network"
 apollo_network_types.path = "crates/apollo_network_types"
 apollo_node.path = "crates/apollo_node"
 apollo_p2p_sync.path = "crates/apollo_p2p_sync"
-apollo_proc_macros.path = "crates/apollo_proc_macros"
+apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.0.0" }
+apollo_proc_macros_tests.path = "crates/apollo_proc_macros_tests"
 apollo_protobuf.path = "crates/apollo_protobuf"
 apollo_reverts.path = "crates/apollo_reverts"
 apollo_rpc.path = "crates/apollo_rpc"
@@ -252,6 +254,7 @@ paste = "1.0.15"
 phf = "0.11"
 pretty_assertions = "1.4.0"
 primitive-types = "0.12.1"
+proc-macro2 = "1.0"
 prometheus-parse = "0.2.4"
 prost = "0.12.1"
 prost-build = "0.12.1"

crates/apollo_batcher/src/batcher.rs

@@ -71,11 +71,11 @@ use crate::metrics::{
     SYNCED_TRANSACTIONS,
 };
 use crate::pre_confirmed_block_writer::{
-    PreConfirmedBlockWriterFactory,
-    PreConfirmedBlockWriterFactoryTrait,
-    PreConfirmedBlockWriterTrait,
+    PreconfirmedBlockWriterFactory,
+    PreconfirmedBlockWriterFactoryTrait,
+    PreconfirmedBlockWriterTrait,
 };
-use crate::pre_confirmed_cende_client::PreConfirmedCendeClientTrait;
+use crate::pre_confirmed_cende_client::PreconfirmedCendeClientTrait;
 use crate::transaction_provider::{ProposeTransactionProvider, ValidateTransactionProvider};
 use crate::utils::{
     deadline_as_instant,
@@ -101,7 +101,7 @@ pub struct Batcher {
     block_builder_factory: Box<dyn BlockBuilderFactoryTrait>,
 
     /// Used to create pre-confirmed block writers.
-    pre_confirmed_block_writer_factory: Box<dyn PreConfirmedBlockWriterFactoryTrait>,
+    pre_confirmed_block_writer_factory: Box<dyn PreconfirmedBlockWriterFactoryTrait>,
 
     /// The height that the batcher is currently working on.
     /// All proposals are considered to be at this height.
@@ -137,7 +137,7 @@ impl Batcher {
         mempool_client: SharedMempoolClient,
         transaction_converter: TransactionConverter,
         block_builder_factory: Box<dyn BlockBuilderFactoryTrait>,
-        pre_confirmed_block_writer_factory: Box<dyn PreConfirmedBlockWriterFactoryTrait>,
+        pre_confirmed_block_writer_factory: Box<dyn PreconfirmedBlockWriterFactoryTrait>,
     ) -> Self {
         Self {
             config,
@@ -580,12 +580,7 @@ impl Batcher {
             block_execution_artifacts.execution_data.rejected_tx_hashes,
         )
         .await?;
-        let execution_infos: Vec<_> = block_execution_artifacts
-            .execution_data
-            .execution_infos
-            .into_iter()
-            .map(|(_, info)| info)
-            .collect();
+        let execution_infos = block_execution_artifacts.execution_data.execution_infos;
 
         LAST_BATCHED_BLOCK.set_lossy(height.0);
         BATCHED_TRANSACTIONS.increment(n_txs);
@@ -711,7 +706,7 @@ impl Batcher {
         mut block_builder: Box<dyn BlockBuilderTrait>,
         abort_signal_sender: tokio::sync::oneshot::Sender<()>,
         final_n_executed_txs_sender: Option<tokio::sync::oneshot::Sender<usize>>,
-        pre_confirmed_block_writer: Option<Box<dyn PreConfirmedBlockWriterTrait>>,
+        pre_confirmed_block_writer: Option<Box<dyn PreconfirmedBlockWriterTrait>>,
         mut proposal_metrics_handle: ProposalMetricsHandle,
     ) -> BatcherResult<()> {
         self.set_active_proposal(proposal_id).await?;
@@ -862,14 +857,14 @@ pub fn create_batcher(
     mempool_client: SharedMempoolClient,
     l1_provider_client: SharedL1ProviderClient,
     class_manager_client: SharedClassManagerClient,
-    pre_confirmed_cende_client: Arc<dyn PreConfirmedCendeClientTrait>,
+    pre_confirmed_cende_client: Arc<dyn PreconfirmedCendeClientTrait>,
 ) -> Batcher {
     let (storage_reader, storage_writer) = apollo_storage::open_storage(config.storage.clone())
         .expect("Failed to open batcher's storage");
 
     let execute_config = &config.block_builder_config.execute_config;
     let worker_pool = Arc::new(WorkerPool::start(execute_config));
-    let pre_confirmed_block_writer_factory = Box::new(PreConfirmedBlockWriterFactory {
+    let pre_confirmed_block_writer_factory = Box::new(PreconfirmedBlockWriterFactory {
         config: config.pre_confirmed_block_writer_config,
         cende_client: pre_confirmed_cende_client,
     });

crates/apollo_batcher/src/batcher_test.rs

@@ -31,7 +31,6 @@ use apollo_mempool_types::mempool_types::CommitBlockArgs;
 use apollo_state_sync_types::state_sync_types::SyncBlock;
 use assert_matches::assert_matches;
 use blockifier::abi::constants;
-use blockifier::transaction::objects::TransactionExecutionInfo;
 use indexmap::{indexmap, IndexSet};
 use metrics_exporter_prometheus::PrometheusBuilder;
 use mockall::predicate::eq;
@@ -69,8 +68,8 @@ use crate::metrics::{
     SYNCED_TRANSACTIONS,
 };
 use crate::pre_confirmed_block_writer::{
-    MockPreConfirmedBlockWriterFactoryTrait,
-    MockPreConfirmedBlockWriterTrait,
+    MockPreconfirmedBlockWriterFactoryTrait,
+    MockPreconfirmedBlockWriterTrait,
 };
 use crate::test_utils::{
     test_txs,
@@ -117,7 +116,7 @@ struct MockDependencies {
     mempool_client: MockMempoolClient,
     l1_provider_client: MockL1ProviderClient,
     block_builder_factory: MockBlockBuilderFactoryTrait,
-    pre_confirmed_block_writer_factory: MockPreConfirmedBlockWriterFactoryTrait,
+    pre_confirmed_block_writer_factory: MockPreconfirmedBlockWriterFactoryTrait,
     class_manager_client: SharedClassManagerClient,
 }
 
@@ -138,11 +137,11 @@ impl Default for MockDependencies {
             .with(eq(CommitBlockArgs::default()))
             .returning(|_| Ok(()));
         let block_builder_factory = MockBlockBuilderFactoryTrait::new();
-        let mut pre_confirmed_block_writer_factory = MockPreConfirmedBlockWriterFactoryTrait::new();
+        let mut pre_confirmed_block_writer_factory = MockPreconfirmedBlockWriterFactoryTrait::new();
         pre_confirmed_block_writer_factory.expect_create().returning(|_, _, _| {
             let (non_working_candidate_tx_sender, _) = tokio::sync::mpsc::channel(1);
             let (non_working_pre_confirmed_tx_sender, _) = tokio::sync::mpsc::channel(1);
-            let mut mock_writer = Box::new(MockPreConfirmedBlockWriterTrait::new());
+            let mut mock_writer = Box::new(MockPreconfirmedBlockWriterTrait::new());
             mock_writer.expect_run().return_once(|| Box::pin(async move { Ok(()) }));
             (mock_writer, non_working_candidate_tx_sender, non_working_pre_confirmed_tx_sender)
         });
@@ -301,7 +300,7 @@ fn verify_decision_reached_response(
     assert_eq!(response.central_objects.bouncer_weights, expected_artifacts.bouncer_weights);
     assert_eq!(
         response.central_objects.execution_infos,
-        expected_artifacts.execution_data.execution_infos.values().cloned().collect::<Vec<_>>()
+        expected_artifacts.execution_data.execution_infos
     );
 }
 
@@ -1088,8 +1087,7 @@ async fn test_execution_info_order_is_kept() {
         batcher_propose_and_commit_block(mock_dependencies).await.unwrap();
 
     // Verify that the execution_infos are in the same order as returned from the block_builder.
-    let expected_execution_infos: Vec<TransactionExecutionInfo> =
-        block_builder_result.execution_data.execution_infos.into_values().collect();
+    let expected_execution_infos = block_builder_result.execution_data.execution_infos;
     assert_eq!(decision_reached_response.central_objects.execution_infos, expected_execution_infos);
 }