papyrus_node: remove central_source_integration_test (#10491)

guy-starkware · web-flow · commit be47f19b2626 · 2025-11-30T20:46:51.000+02:00
* papyrus_node: remove central_source_integration_test

* apollo_l1_gas_price: add config items to handle fusaka upgrade

* papyrus_base_layer: add code to calculate data price in the era of Fusaka
diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml
@@ -79,22 +79,6 @@ jobs:
 
   #     - name: Run p2p sync end-to-end test
   #       run: scripts/papyrus/p2p_sync_e2e_test/main.sh ${{ secrets.CI_BASE_LAYER_NODE_URL }}
-
-  integration-test:
-    runs-on: namespace-profile-medium-ubuntu-24-04-amd64
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/bootstrap
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-      - run: >
-          cargo test
-          --test latency_histogram
-          --test gateway_integration_test
-          --test feeder_gateway_integration_test
-          -- --include-ignored --skip test_gw_integration_testnet;
-          cargo run -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream"
-
   test-no-rpc:
     runs-on: namespace-profile-medium-ubuntu-24-04-amd64
     steps:
diff --git a/.github/workflows/papyrus_nightly-tests.yml b/.github/workflows/papyrus_nightly-tests.yml
@@ -76,22 +76,6 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
       - run: cargo build -p papyrus_load_test
 
-  integration-test:
-    runs-on: macos-latest
-    if: github.event.schedule == '30 0 * * *'
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/bootstrap
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-      - run: >
-          cargo test
-          --test latency_histogram
-          --test gateway_integration_test
-          --test feeder_gateway_integration_test
-          -- --include-ignored --skip test_gw_integration_testnet;
-          cargo run -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream"
-
   # TODO(dvir): make this run only if the path 'crates/apollo_storage/src/db/**' (same path as in the CI)  was changed on the
   # last day and increase the number of repetitions.
   random-table-test:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/config/papyrus/default_config.json b/config/papyrus/default_config.json
@@ -4,6 +4,21 @@
     "privacy": "Private",
     "value": "https://mainnet.infura.io/v3/%3Cyour_api_key%3E"
   },
+  "base_layer.fusaka_no_bpo_start_block_number": {
+    "description": "The block number at which the Fusaka upgrade was deployed (not including any BPO updates).",
+    "privacy": "Public",
+    "value": 0
+  },
+  "base_layer.bpo1_start_block_number": {
+    "description": "The block number at which BPO1 update was deployed.",
+    "privacy": "Public",
+    "value": 0
+  },
+  "base_layer.bpo2_start_block_number": {
+    "description": "The block number at which BPO2 update was deployed.",
+    "privacy": "Public",
+    "value": 0
+  },
   "base_layer.prague_blob_gas_calc": {
     "description": "If true use the blob gas calculcation from the Pectra upgrade. If false use the EIP 4844 calculation.",
     "privacy": "Public",
diff --git a/crates/apollo_deployments/resources/app_configs/base_layer_config.json b/crates/apollo_deployments/resources/app_configs/base_layer_config.json
@@ -1,4 +1,7 @@
 {
+  "base_layer_config.fusaka_no_bpo_start_block_number": 9408577,
+  "base_layer_config.bpo1_start_block_number": 9456501,
+  "base_layer_config.bpo2_start_block_number": 9504747,
   "base_layer_config.prague_blob_gas_calc": true,
   "base_layer_config.timeout_millis": 1000
 }
diff --git a/crates/apollo_node/resources/config_schema.json b/crates/apollo_node/resources/config_schema.json
@@ -9,6 +9,21 @@
     "privacy": "Private",
     "value": "https://mainnet.infura.io/v3/%3Cyour_api_key%3E"
   },
+  "base_layer_config.bpo1_start_block_number": {
+    "description": "The block number at which BPO1 update was deployed.",
+    "privacy": "Public",
+    "value": 0
+  },
+  "base_layer_config.bpo2_start_block_number": {
+    "description": "The block number at which BPO2 update was deployed.",
+    "privacy": "Public",
+    "value": 0
+  },
+  "base_layer_config.fusaka_no_bpo_start_block_number": {
+    "description": "The block number at which the Fusaka upgrade was deployed (not including any BPO updates).",
+    "privacy": "Public",
+    "value": 0
+  },
   "base_layer_config.prague_blob_gas_calc": {
     "description": "If true use the blob gas calculcation from the Pectra upgrade. If false use the EIP 4844 calculation.",
     "privacy": "Public",
diff --git a/crates/papyrus_base_layer/src/base_layer_test.rs b/crates/papyrus_base_layer/src/base_layer_test.rs
@@ -99,15 +99,56 @@ async fn get_gas_price_and_timestamps() {
         ..Default::default()
     };
 
-    // Test pectra blob.
-
     let mocked_block_response =
         &Some(Block::new(AlloyRpcHeader::new(header), BlockTransactions::<B256>::default()));
+
+    // Test fusaka blob.
+    base_layer.config.fusaka_no_bpo_start_block_number = 0;
+    base_layer.config.bpo1_start_block_number = 10;
+    base_layer.config.bpo2_start_block_number = 10;
+
     asserter.push_success(mocked_block_response);
     let header = base_layer.get_block_header(0).await.unwrap().unwrap();
 
     assert_eq!(header.base_fee_per_gas, 5);
 
+    // See eip4844::fake_exponential().
+    // Roughly e ** (BLOB_GAS / eip7691::BLOB_GASPRICE_UPDATE_FRACTION_PECTRA)
+    let expected_fusaka_blob_calc = 7;
+    assert_eq!(header.blob_fee, expected_fusaka_blob_calc);
+
+    // Test BPO1 blob.
+    base_layer.config.fusaka_no_bpo_start_block_number = 0;
+    base_layer.config.bpo1_start_block_number = 0;
+    base_layer.config.bpo2_start_block_number = 10;
+
+    asserter.push_success(mocked_block_response);
+    let header = base_layer.get_block_header(0).await.unwrap().unwrap();
+
+    // See eip4844::fake_exponential().
+    // Roughly e ** (BLOB_GAS / eip7691::BLOB_GASPRICE_UPDATE_FRACTION_PECTRA)
+    let expected_bpo1_blob_calc = 3;
+    assert_eq!(header.blob_fee, expected_bpo1_blob_calc);
+
+    // Test BPO2 blob.
+    base_layer.config.fusaka_no_bpo_start_block_number = 0;
+    base_layer.config.bpo1_start_block_number = 0;
+    base_layer.config.bpo2_start_block_number = 0;
+
+    asserter.push_success(mocked_block_response);
+    let header = base_layer.get_block_header(0).await.unwrap().unwrap();
+
+    let expected_bpo2_blob_calc = 2;
+    assert_eq!(header.blob_fee, expected_bpo2_blob_calc);
+
+    // Test pectra blob.
+    base_layer.config.fusaka_no_bpo_start_block_number = 10;
+    base_layer.config.bpo1_start_block_number = 10;
+    base_layer.config.bpo2_start_block_number = 10;
+
+    asserter.push_success(mocked_block_response);
+    let header = base_layer.get_block_header(0).await.unwrap().unwrap();
+
     // See eip4844::fake_exponential().
     // Roughly e ** (BLOB_GAS / eip7691::BLOB_GASPRICE_UPDATE_FRACTION_PECTRA)
     let expected_pectra_blob_calc = 7;
diff --git a/crates/papyrus_base_layer/src/ethereum_base_layer_contract.rs b/crates/papyrus_base_layer/src/ethereum_base_layer_contract.rs
@@ -243,6 +243,20 @@ impl BaseLayerContract for EthereumBaseLayerContract {
             return Ok(None);
         };
         let blob_fee = match block.header.excess_blob_gas {
+            Some(excess_blob_gas) if self.config.bpo2_start_block_number <= block.header.number => {
+                // Fusaka BPO2 update.
+                eip7840::BlobParams::bpo2().calc_blob_fee(excess_blob_gas)
+            }
+            Some(excess_blob_gas) if self.config.bpo1_start_block_number <= block.header.number => {
+                // Fusaka BPO1 update.
+                eip7840::BlobParams::bpo1().calc_blob_fee(excess_blob_gas)
+            }
+            Some(excess_blob_gas)
+                if self.config.fusaka_no_bpo_start_block_number <= block.header.number =>
+            {
+                // Fusaka update.
+                eip7840::BlobParams::osaka().calc_blob_fee(excess_blob_gas)
+            }
             Some(excess_blob_gas) if self.config.prague_blob_gas_calc => {
                 // Pectra update.
                 eip7840::BlobParams::prague().calc_blob_fee(excess_blob_gas)
@@ -310,6 +324,14 @@ impl PartialEq for EthereumBaseLayerError {
 pub struct EthereumBaseLayerConfig {
     pub node_url: Url,
     pub starknet_contract_address: EthereumContractAddress,
+    // Note: dates of fusaka-related upgrades: https://eips.ethereum.org/EIPS/eip-7607
+    // Note 2: make sure to calculate the block number as activation epoch x32.
+    // The block number at which the Fusaka upgrade was deployed (not including any BPO updates).
+    pub fusaka_no_bpo_start_block_number: L1BlockNumber,
+    // The block number at which BPO1 update was deployed.
+    pub bpo1_start_block_number: L1BlockNumber,
+    // The block number at which BPO2 update was deployed.
+    pub bpo2_start_block_number: L1BlockNumber,
     pub prague_blob_gas_calc: bool,
     #[serde(deserialize_with = "deserialize_milliseconds_to_duration")]
     pub timeout_millis: Duration,
@@ -332,6 +354,25 @@ impl SerializeConfig for EthereumBaseLayerConfig {
                 "Starknet contract address in ethereum.",
                 ParamPrivacyInput::Public,
             ),
+            ser_param(
+                "fusaka_no_bpo_start_block_number",
+                &self.fusaka_no_bpo_start_block_number,
+                "The block number at which the Fusaka upgrade was deployed (not including any BPO \
+                 updates).",
+                ParamPrivacyInput::Public,
+            ),
+            ser_param(
+                "bpo1_start_block_number",
+                &self.bpo1_start_block_number,
+                "The block number at which BPO1 update was deployed.",
+                ParamPrivacyInput::Public,
+            ),
+            ser_param(
+                "bpo2_start_block_number",
+                &self.bpo2_start_block_number,
+                "The block number at which BPO2 update was deployed.",
+                ParamPrivacyInput::Public,
+            ),
             ser_param(
                 "prague_blob_gas_calc",
                 &self.prague_blob_gas_calc,
@@ -356,6 +397,9 @@ impl Default for EthereumBaseLayerConfig {
         Self {
             node_url: "https://mainnet.infura.io/v3/<your_api_key>".parse().unwrap(),
             starknet_contract_address,
+            fusaka_no_bpo_start_block_number: 0,
+            bpo1_start_block_number: 0,
+            bpo2_start_block_number: 0,
             prague_blob_gas_calc: true,
             timeout_millis: Duration::from_millis(1000),
         }
diff --git a/crates/papyrus_node/Cargo.toml b/crates/papyrus_node/Cargo.toml
@@ -10,11 +10,6 @@ default = ["rpc"]
 rpc = ["apollo_rpc"]
 testing = []
 
-[[bin]]
-name = "central_source_integration_test"
-path = "src/bin/central_source_integration_test.rs"
-required-features = ["futures-util", "tokio-stream"]
-
 [dependencies]
 anyhow.workspace = true
 apollo_central_sync.workspace = true
@@ -46,10 +41,6 @@ tracing.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 validator = { workspace = true, features = ["derive"] }
 
-# Binaries dependencies
-futures-util = { workspace = true, optional = true }
-tokio-stream = { workspace = true, optional = true }
-
 [dev-dependencies]
 apollo_infra_utils = { workspace = true, features = ["testing"] }
 apollo_test_utils.workspace = true
diff --git a/crates/papyrus_node/src/bin/central_source_integration_test.rs b/crates/papyrus_node/src/bin/central_source_integration_test.rs
diff --git a/crates/papyrus_node/src/config/snapshots/papyrus_node__config__config_test__dump_default_config.snap b/crates/papyrus_node/src/config/snapshots/papyrus_node__config__config_test__dump_default_config.snap
@@ -3,6 +3,27 @@ source: crates/papyrus_node/src/config/config_test.rs
 expression: dumped_default_config
 ---
 {
+  "base_layer.bpo1_start_block_number": {
+    "description": "The block number at which BPO1 update was deployed.",
+    "value": {
+      "$serde_json::private::Number": "0"
+    },
+    "privacy": "Public"
+  },
+  "base_layer.bpo2_start_block_number": {
+    "description": "The block number at which BPO2 update was deployed.",
+    "value": {
+      "$serde_json::private::Number": "0"
+    },
+    "privacy": "Public"
+  },
+  "base_layer.fusaka_no_bpo_start_block_number": {
+    "description": "The block number at which the Fusaka upgrade was deployed (not including any BPO updates).",
+    "value": {
+      "$serde_json::private::Number": "0"
+    },
+    "privacy": "Public"
+  },
   "base_layer.node_url": {
     "description": "Initial ethereum node URL. A schema to match to Infura node: https://mainnet.infura.io/v3/<your_api_key>, but any other node can be used. May be be replaced during runtime if becomes inoperative",
     "value": "https://mainnet.infura.io/v3/%3Cyour_api_key%3E",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "base_layer_config.fusaka_no_bpo_start_block_number": 9408577,`
	`3`	`+ "base_layer_config.bpo1_start_block_number": 9456501,`
	`4`	`+ "base_layer_config.bpo2_start_block_number": 9504747,`
`2`	`5`	`"base_layer_config.prague_blob_gas_calc": true,`
`3`	`6`	`"base_layer_config.timeout_millis": 1000`
`4`	`7`	`}`