feat(taiko-client,taiko-client-rs): remove blockIndex in anchorV4 (#20610)

Co-authored-by: Gustavo Gonzalez <gustavo@taiko.xyz>
Co-authored-by: ggonzalez94 <17907743+ggonzalez94@users.noreply.github.com>
Co-authored-by: Daniel Wang <99078276+dantaik@users.noreply.github.com>

Author: 4 people

packages/protocol/contracts/layer1/devnet/DevnetInbox.sol

@@ -50,7 +50,7 @@ contract DevnetInbox is InboxOptimized2 {
                 ringBufferSize: _RING_BUFFER_SIZE,
                 basefeeSharingPctg: 75,
                 minForcedInclusionCount: 1,
-                forcedInclusionDelay: 384, // 1 epoch
+                forcedInclusionDelay: 0,
                 forcedInclusionFeeInGwei: 10_000_000, // 0.01 ETH base fee
                 forcedInclusionFeeDoubleThreshold: 50, // fee doubles at 50 pending
                 minCheckpointDelay: 384 seconds, // 1 epoch

packages/taiko-client-rs/crates/bindings/src/anchor.rs

@@ -18,6 +18,7 @@ interface IInbox {
         uint256 minForcedInclusionCount;
         uint16 forcedInclusionDelay;
         uint64 forcedInclusionFeeInGwei;
+        uint64 forcedInclusionFeeDoubleThreshold;
         uint16 minCheckpointDelay;
         uint8 permissionlessInclusionMultiplier;
         uint16 compositeKeyVersion;
@@ -119,6 +120,11 @@ interface IInbox {
             "type": "uint64",
             "internalType": "uint64"
           },
+          {
+            "name": "forcedInclusionFeeDoubleThreshold",
+            "type": "uint64",
+            "internalType": "uint64"
+          },
           {
             "name": "minCheckpointDelay",
             "type": "uint16",
@@ -296,7 +302,7 @@ pub mod IInbox {
     #[derive(serde::Serialize, serde::Deserialize)]
     #[derive(Default, Debug, PartialEq, Eq, Hash)]
     /**```solidity
-struct Config { address codec; address bondToken; address checkpointStore; address proofVerifier; address proposerChecker; uint48 provingWindow; uint48 extendedProvingWindow; uint256 maxFinalizationCount; uint48 finalizationGracePeriod; uint256 ringBufferSize; uint8 basefeeSharingPctg; uint256 minForcedInclusionCount; uint16 forcedInclusionDelay; uint64 forcedInclusionFeeInGwei; uint16 minCheckpointDelay; uint8 permissionlessInclusionMultiplier; uint16 compositeKeyVersion; }
+struct Config { address codec; address bondToken; address checkpointStore; address proofVerifier; address proposerChecker; uint48 provingWindow; uint48 extendedProvingWindow; uint256 maxFinalizationCount; uint48 finalizationGracePeriod; uint256 ringBufferSize; uint8 basefeeSharingPctg; uint256 minForcedInclusionCount; uint16 forcedInclusionDelay; uint64 forcedInclusionFeeInGwei; uint64 forcedInclusionFeeDoubleThreshold; uint16 minCheckpointDelay; uint8 permissionlessInclusionMultiplier; uint16 compositeKeyVersion; }
 ```*/
     #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
     #[derive(Clone)]
@@ -330,6 +336,8 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
         #[allow(missing_docs)]
         pub forcedInclusionFeeInGwei: u64,
         #[allow(missing_docs)]
+        pub forcedInclusionFeeDoubleThreshold: u64,
+        #[allow(missing_docs)]
         pub minCheckpointDelay: u16,
         #[allow(missing_docs)]
         pub permissionlessInclusionMultiplier: u8,
@@ -360,6 +368,7 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
             alloy::sol_types::sol_data::Uint<256>,
             alloy::sol_types::sol_data::Uint<16>,
             alloy::sol_types::sol_data::Uint<64>,
+            alloy::sol_types::sol_data::Uint<64>,
             alloy::sol_types::sol_data::Uint<16>,
             alloy::sol_types::sol_data::Uint<8>,
             alloy::sol_types::sol_data::Uint<16>,
@@ -380,6 +389,7 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
             alloy::sol_types::private::primitives::aliases::U256,
             u16,
             u64,
+            u64,
             u16,
             u8,
             u16,
@@ -414,6 +424,7 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
                     value.minForcedInclusionCount,
                     value.forcedInclusionDelay,
                     value.forcedInclusionFeeInGwei,
+                    value.forcedInclusionFeeDoubleThreshold,
                     value.minCheckpointDelay,
                     value.permissionlessInclusionMultiplier,
                     value.compositeKeyVersion,
@@ -439,9 +450,10 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
                     minForcedInclusionCount: tuple.11,
                     forcedInclusionDelay: tuple.12,
                     forcedInclusionFeeInGwei: tuple.13,
-                    minCheckpointDelay: tuple.14,
-                    permissionlessInclusionMultiplier: tuple.15,
-                    compositeKeyVersion: tuple.16,
+                    forcedInclusionFeeDoubleThreshold: tuple.14,
+                    minCheckpointDelay: tuple.15,
+                    permissionlessInclusionMultiplier: tuple.16,
+                    compositeKeyVersion: tuple.17,
                 }
             }
         }
@@ -504,6 +516,11 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
                     > as alloy_sol_types::SolType>::tokenize(
                         &self.forcedInclusionFeeInGwei,
                     ),
+                    <alloy::sol_types::sol_data::Uint<
+                        64,
+                    > as alloy_sol_types::SolType>::tokenize(
+                        &self.forcedInclusionFeeDoubleThreshold,
+                    ),
                     <alloy::sol_types::sol_data::Uint<
                         16,
                     > as alloy_sol_types::SolType>::tokenize(&self.minCheckpointDelay),
@@ -589,7 +606,7 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
             #[inline]
             fn eip712_root_type() -> alloy_sol_types::private::Cow<'static, str> {
                 alloy_sol_types::private::Cow::Borrowed(
-                    "Config(address codec,address bondToken,address checkpointStore,address proofVerifier,address proposerChecker,uint48 provingWindow,uint48 extendedProvingWindow,uint256 maxFinalizationCount,uint48 finalizationGracePeriod,uint256 ringBufferSize,uint8 basefeeSharingPctg,uint256 minForcedInclusionCount,uint16 forcedInclusionDelay,uint64 forcedInclusionFeeInGwei,uint16 minCheckpointDelay,uint8 permissionlessInclusionMultiplier,uint16 compositeKeyVersion)",
+                    "Config(address codec,address bondToken,address checkpointStore,address proofVerifier,address proposerChecker,uint48 provingWindow,uint48 extendedProvingWindow,uint256 maxFinalizationCount,uint48 finalizationGracePeriod,uint256 ringBufferSize,uint8 basefeeSharingPctg,uint256 minForcedInclusionCount,uint16 forcedInclusionDelay,uint64 forcedInclusionFeeInGwei,uint64 forcedInclusionFeeDoubleThreshold,uint16 minCheckpointDelay,uint8 permissionlessInclusionMultiplier,uint16 compositeKeyVersion)",
                 )
             }
             #[inline]
@@ -677,6 +694,12 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
                             &self.forcedInclusionFeeInGwei,
                         )
                         .0,
+                    <alloy::sol_types::sol_data::Uint<
+                        64,
+                    > as alloy_sol_types::SolType>::eip712_data_word(
+                            &self.forcedInclusionFeeDoubleThreshold,
+                        )
+                        .0,
                     <alloy::sol_types::sol_data::Uint<
                         16,
                     > as alloy_sol_types::SolType>::eip712_data_word(
@@ -764,6 +787,11 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
                     > as alloy_sol_types::EventTopic>::topic_preimage_length(
                         &rust.forcedInclusionFeeInGwei,
                     )
+                    + <alloy::sol_types::sol_data::Uint<
+                        64,
+                    > as alloy_sol_types::EventTopic>::topic_preimage_length(
+                        &rust.forcedInclusionFeeDoubleThreshold,
+                    )
                     + <alloy::sol_types::sol_data::Uint<
                         16,
                     > as alloy_sol_types::EventTopic>::topic_preimage_length(
@@ -862,6 +890,12 @@ struct Config { address codec; address bondToken; address checkpointStore; addre
                     &rust.forcedInclusionFeeInGwei,
                     out,
                 );
+                <alloy::sol_types::sol_data::Uint<
+                    64,
+                > as alloy_sol_types::EventTopic>::encode_topic_preimage(
+                    &rust.forcedInclusionFeeDoubleThreshold,
+                    out,
+                );
                 <alloy::sol_types::sol_data::Uint<
                     16,
                 > as alloy_sol_types::EventTopic>::encode_topic_preimage(

packages/taiko-client-rs/crates/bindings/src/codec_optimized.rs

@@ -67,9 +67,6 @@ pub enum DerivationError {
     /// Failed to fetch the propose transaction from L1.
     #[error("failed to fetch propose transaction for proposal {proposal_id}: {reason}")]
     ProposeTransactionQuery { proposal_id: u64, reason: String },
-    /// Block index exceeded the supported range.
-    #[error("block index {index} exceeds u16 range")]
-    BlockIndexOverflow { index: usize },
     /// Failed to query the anchor block fields.
     #[error("failed to fetch anchor block {block_number}: {reason}")]
     AnchorBlockQuery { block_number: u64, reason: String },

packages/taiko-client-rs/crates/bindings/src/i_inbox.rs

@@ -42,7 +42,6 @@ pub struct AnchorV4Input {
     pub prover_auth: Vec<u8>,
     pub bond_instructions_hash: B256,
     pub bond_instructions: Vec<BondInstruction>,
-    pub block_index: u16,
     pub anchor_block_number: u64,
     pub anchor_block_hash: B256,
     pub anchor_state_root: B256,
@@ -91,7 +90,6 @@ where
             prover_auth,
             bond_instructions_hash,
             bond_instructions,
-            block_index,
             anchor_block_number,
             anchor_block_hash,
             anchor_state_root,
@@ -128,9 +126,11 @@ where
         info!(
             l2_height,
             proposal_id,
-            block_index,
+            ?prover_auth,
+            ?anchor_block_number,
             ?anchor_block_hash,
             ?anchor_state_root,
+            ?base_fee,
             "assembling shasta anchor anchorV4 transaction",
         );
 
@@ -143,7 +143,6 @@ where
         };
 
         let block_params = BlockParams {
-            blockIndex: block_index,
             anchorBlockNumber: U48::from(anchor_block_number),
             anchorBlockHash: anchor_block_hash,
             anchorStateRoot: anchor_state_root,

packages/taiko-client-rs/crates/driver/src/derivation/pipeline/error.rs

@@ -46,19 +46,10 @@ struct SegmentContext<'a> {
     proposal_origin_block_hash: B256,
     /// Fork height for Shasta activation.
     shasta_fork_height: u64,
-    /// Positional data describing where the segment sits within the proposal.
-    position: SegmentPosition,
-}
-
-/// Tracks the absolute position of a segment within the proposal bundle.
-#[derive(Clone, Copy)]
-struct SegmentPosition {
     /// Index of the segment within the proposal bundle.
-    index: usize,
+    segment_index: usize,
     /// Total number of segments in the proposal bundle.
-    total: usize,
-    /// Number of blocks included prior to this segment.
-    blocks_before: usize,
+    segments_total: usize,
 }
 
 /// Position metadata passed down to block-level processing.
@@ -72,8 +63,6 @@ struct BlockPosition {
     block_index: usize,
     /// Total number of blocks in the segment.
     blocks_len: usize,
-    /// Global offset of the first block in the segment.
-    blocks_before_segment: usize,
     /// Whether the block originates from a forced inclusion segment.
     forced_inclusion: bool,
 }
@@ -126,8 +115,6 @@ struct BondInstructionData {
 struct AnchorTxInputs<'a> {
     /// Manifest-provided block metadata.
     block: &'a BlockManifest,
-    /// Positional data describing where the block sits within the proposal.
-    position: &'a BlockPosition,
     /// Height of the block being built.
     block_number: u64,
     /// Base fee target for the upcoming block.
@@ -152,25 +139,6 @@ fn manifest_is_default(manifest: &DerivationSourceManifest) -> bool {
         block.transactions.is_empty()
 }
 
-impl SegmentPosition {
-    // Convert the segment position into a block position for a specific block within the segment.
-    fn into_block_position(
-        self,
-        block_index: usize,
-        blocks_len: usize,
-        forced_inclusion: bool,
-    ) -> BlockPosition {
-        BlockPosition {
-            segment_index: self.index,
-            segments_total: self.total,
-            block_index,
-            blocks_len,
-            blocks_before_segment: self.blocks_before,
-            forced_inclusion,
-        }
-    }
-}
-
 impl BlockPosition {
     // Check if this is the final block of the final segment.
     fn is_final(&self) -> bool {
@@ -181,11 +149,6 @@ impl BlockPosition {
     fn is_forced_inclusion(&self) -> bool {
         self.forced_inclusion
     }
-
-    // Compute the global index of this block within the entire proposal bundle.
-    fn global_index(&self) -> usize {
-        self.blocks_before_segment + self.block_index
-    }
 }
 
 impl<P> ShastaDerivationPipeline<P>
@@ -204,7 +167,6 @@ where
     ) -> Result<Vec<EngineBlockOutcome>, DerivationError> {
         // Each source can expand into multiple payloads; accumulate their engine outcomes in order.
         let segments_total = sources.len();
-        let mut blocks_before = 0usize;
         let mut outcomes = Vec::new();
         let parent_hash = state.header.hash_slow();
         let mut forkchoice_state = ForkchoiceState {
@@ -218,11 +180,8 @@ where
                 meta,
                 proposal_origin_block_hash,
                 shasta_fork_height,
-                position: SegmentPosition {
-                    index: segment_index,
-                    total: segments_total,
-                    blocks_before,
-                },
+                segment_index,
+                segments_total,
             };
             let segment_outcomes = self
                 .process_manifest_segment(
@@ -234,9 +193,7 @@ where
                 )
                 .await?;
 
-            let blocks_produced = segment_outcomes.len();
             outcomes.extend(segment_outcomes);
-            blocks_before += blocks_produced;
         }
 
         // Ensure the derived bond instruction hash matches what the proposal advertised.
@@ -259,7 +216,13 @@ where
         applier: &(dyn PayloadApplier + Send + Sync),
         forkchoice_state: &mut ForkchoiceState,
     ) -> Result<Vec<EngineBlockOutcome>, DerivationError> {
-        let SegmentContext { meta, proposal_origin_block_hash, shasta_fork_height, position } = ctx;
+        let SegmentContext {
+            meta,
+            proposal_origin_block_hash,
+            shasta_fork_height,
+            segment_index,
+            segments_total,
+        } = ctx;
 
         // Sanitize the manifest before deriving payload attributes.
         let mut decoded_manifest = segment.manifest;
@@ -296,11 +259,13 @@ where
                 meta,
                 origin_block_hash: proposal_origin_block_hash,
                 shasta_fork_height,
-                position: position.into_block_position(
+                position: BlockPosition {
+                    segment_index,
+                    segments_total,
                     block_index,
                     blocks_len,
-                    segment.is_forced_inclusion,
-                ),
+                    forced_inclusion: segment.is_forced_inclusion,
+                },
                 is_low_bond_proposal,
             };
             let outcome = self
@@ -337,7 +302,6 @@ where
 
         let anchor_inputs = AnchorTxInputs {
             block,
-            position: &position,
             block_number,
             block_base_fee,
             bond_instructions: &bond_data.instructions,
@@ -564,7 +528,6 @@ where
     ) -> Result<TxEnvelope, DerivationError> {
         let AnchorTxInputs {
             block,
-            position,
             block_number,
             block_base_fee,
             bond_instructions,
@@ -574,9 +537,6 @@ where
         let (anchor_block_hash, anchor_state_root) =
             self.resolve_anchor_block_fields(block.anchor_block_number).await?;
 
-        let block_index = u16::try_from(position.global_index())
-            .map_err(|_| DerivationError::BlockIndexOverflow { index: position.global_index() })?;
-
         let tx = self
             .anchor_constructor
             .assemble_anchor_v4_tx(
@@ -587,7 +547,6 @@ where
                     prover_auth: meta.prover_auth_bytes.clone().to_vec(),
                     bond_instructions_hash,
                     bond_instructions: bond_instructions.to_vec(),
-                    block_index,
                     anchor_block_number: block.anchor_block_number,
                     anchor_block_hash,
                     anchor_state_root,

packages/taiko-client-rs/crates/driver/src/derivation/pipeline/shasta/anchor.rs

@@ -1 +1 @@
-311ed4e1a28ecf76490687a58f0a6f46b879b59c
+526ba18b88f0adc00504ddabc7b54dbe7a564353