feat: add extra data calculation (#691)

* feat: add extra data calculation

* bump version

* test: add extra data encoding tests

Author: mikhailUshakoff

Cargo.lock

@@ -12,7 +12,7 @@ resolver = "2"
 default-members = ["node"]
 
 [workspace.package]
-version = "1.21.8"
+version = "1.21.9"
 edition = "2024"
 repository = "https://github.com/NethermindEth/Catalyst"
 license = "MIT"

Cargo.toml

@@ -1,6 +1,7 @@
 // TODO remove allow dead_code when the module is used
 #![allow(dead_code)]
 
+use super::protocol_config::ProtocolConfig;
 use crate::l1::config::ContractAddresses;
 use alloy::primitives::Bytes;
 use alloy::{eips::BlockNumberOrTag, primitives::Address, providers::DynProvider};
@@ -239,4 +240,20 @@ impl ExecutionLayer {
     pub async fn is_transaction_in_progress(&self) -> Result<bool, Error> {
         self.transaction_monitor.is_transaction_in_progress().await
     }
+
+    pub async fn fetch_protocol_config(&self) -> Result<ProtocolConfig, Error> {
+        let shasta_inbox = IInbox::new(self.contract_addresses.shasta_inbox, self.provider.clone());
+        let shasta_config = shasta_inbox
+            .getConfig()
+            .call()
+            .await
+            .map_err(|e| anyhow::anyhow!("Failed to call getConfig for Inbox: {e}"))?;
+
+        info!(
+            "Shasta config: basefeeSharingPctg: {}",
+            shasta_config.basefeeSharingPctg,
+        );
+
+        Ok(ProtocolConfig::from(&shasta_config))
+    }
 }

shasta/src/l1/execution_layer.rs

@@ -3,3 +3,4 @@ pub mod config;
 pub mod event_indexer;
 pub mod execution_layer;
 pub mod proposal_tx_builder;
+pub mod protocol_config;

shasta/src/l1/mod.rs

@@ -0,0 +1,18 @@
+use taiko_bindings::i_inbox::IInbox::Config;
+
+#[derive(Clone, Default)]
+pub struct ProtocolConfig {
+    basefee_sharing_pctg: u8,
+}
+
+impl ProtocolConfig {
+    pub fn from(shasta_config: &Config) -> Self {
+        Self {
+            basefee_sharing_pctg: shasta_config.basefeeSharingPctg,
+        }
+    }
+
+    pub fn get_basefee_sharing_pctg(&self) -> u8 {
+        self.basefee_sharing_pctg
+    }
+}

shasta/src/l1/protocol_config.rs

@@ -2,6 +2,7 @@
 #![allow(dead_code)]
 
 use super::execution_layer::L2ExecutionLayer;
+use crate::l1::protocol_config::ProtocolConfig;
 use crate::utils::proposal::Proposal;
 use alloy::{
     consensus::BlockHeader,
@@ -25,7 +26,6 @@ use common::{
         l2_tx_lists::{self, PreBuiltTxList},
     },
 };
-use pacaya::l1::protocol_config::ProtocolConfig;
 use pacaya::l2::config::TaikoConfig;
 use std::{sync::Arc, time::Duration};
 use tracing::{debug, trace};
@@ -85,7 +85,7 @@ impl Taiko {
             .get_pending_l2_tx_list(
                 base_fee,
                 batches_ready_to_send,
-                self.get_protocol_config().get_block_max_gas_limit(),
+                15000000, // TODO fix gas limit
             )
             .await
     }
@@ -252,8 +252,6 @@ impl Taiko {
 
         let timestamp = proposal.get_last_block_timestamp()?;
 
-        let sharing_pctg = 0; // TODO
-
         let anchor_tx = self
             .l2_execution_layer
             .construct_anchor_tx(proposal, l2_slot_info)
@@ -263,12 +261,14 @@ impl Taiko {
             .collect::<Vec<_>>();
 
         let tx_list_bytes = l2_tx_lists::encode_and_compress(&tx_list)?;
-        let extra_data = vec![sharing_pctg];
+
+        let sharing_pctg = self.protocol_config.get_basefee_sharing_pctg();
+        let extra_data = Self::encode_extra_data(sharing_pctg, false);
 
         let executable_data = ExecutableData {
             base_fee_per_gas: l2_slot_info.base_fee(),
             block_number: l2_slot_info.parent_id() + 1,
-            extra_data: format!("0x{:0>64}", hex::encode(extra_data)),
+            extra_data: format!("0x{:0>64x}", extra_data),
             fee_recipient: proposal.coinbase.to_string(),
             gas_limit: 241_000_000u64,
             parent_hash: format!("0x{}", hex::encode(l2_slot_info.parent_hash())),
@@ -286,6 +286,10 @@ impl Taiko {
             .preconf_blocks(request_body, operation_type)
             .await
     }
+
+    fn encode_extra_data(basefee_sharing_pctg: u8, is_low_bond_proposal: bool) -> u16 {
+        u16::from(basefee_sharing_pctg) << 8 | u16::from(is_low_bond_proposal)
+    }
 }
 
 impl Bridgeable for Taiko {
@@ -308,3 +312,16 @@ impl Bridgeable for Taiko {
             .await
     }
 }
+
+mod tests {
+    #[test]
+    fn test_encode_extra_data() {
+        use super::Taiko;
+
+        let extra_data = Taiko::encode_extra_data(30, true);
+        assert_eq!(extra_data, 0b00011110_00000001);
+
+        let extra_data = Taiko::encode_extra_data(50, false);
+        assert_eq!(extra_data, 0b00110010_00000000);
+    }
+}

shasta/src/l2/taiko.rs

@@ -59,11 +59,11 @@ pub async fn create_shasta_node(
         taiko_config.signer.get_address(),
     )?)
     .map_err(|e| anyhow::anyhow!("Failed to create L2Engine: {}", e))?;
+    let protocol_config = ethereum_l1.execution_layer.fetch_protocol_config().await?;
 
     let taiko = crate::l2::taiko::Taiko::new(
         ethereum_l1.slot_clock.clone(),
-        // TODO fetch actual protocol config
-        pacaya::l1::protocol_config::ProtocolConfig::default(),
+        protocol_config,
         metrics.clone(),
         taiko_config,
         l2_engine,