fix: pop consolidation requests in payload builder

paradigmxyz · Aug 28, 2024 · 62eec7b · 62eec7b
1 parent 85ef1fb
commit 62eec7b
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/crates/ethereum/payload/src/lib.rs b/crates/ethereum/payload/src/lib.rs
@@ -201,14 +201,21 @@ where
                 // We do not calculate the EIP-6110 deposit requests because there are no
                 // transactions in an empty payload.
                 let withdrawal_requests = post_block_withdrawal_requests_contract_call(
-                    &self.evm_config,
+                    &evm_config,
+                    &mut db,
+                    &initialized_cfg,
+                    &initialized_block_env,
+                )
+                .map_err(|err| PayloadBuilderError::Internal(err.into()))?;
+                let consolidation_requests = post_block_consolidation_requests_contract_call(
+                    &evm_config,
                     &mut db,
                     &initialized_cfg,
                     &initialized_block_env,
                 )
                 .map_err(|err| PayloadBuilderError::Internal(err.into()))?;
 
-                let requests = withdrawal_requests;
+                let requests = [withdrawal_requests, consolidation_requests].concat();
                 let requests_root = calculate_requests_root(&requests);
                 (Some(requests.into()), Some(requests_root))
             } else {
@@ -454,8 +461,15 @@ where
             &initialized_block_env,
         )
         .map_err(|err| PayloadBuilderError::Internal(err.into()))?;
+        let consolidation_requests = post_block_consolidation_requests_contract_call(
+            &evm_config,
+            &mut db,
+            &initialized_cfg,
+            &initialized_block_env,
+        )
+        .map_err(|err| PayloadBuilderError::Internal(err.into()))?;
 
-        let requests = [deposit_requests, withdrawal_requests].concat();
+        let requests = [deposit_requests, withdrawal_requests, consolidation_requests].concat();
         let requests_root = calculate_requests_root(&requests);
         (Some(requests.into()), Some(requests_root))
     } else {