Add flashtestations integration tests (#283)

* Add flashtestation builder tx and registration in block

* copilot comments

* Add flashtestations integration tests

* logging improvements

* Update crates/op-rbuilder/src/tests/flashtestations.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: avalonche

README.md

@@ -63,7 +63,7 @@ This will increment the flashblock number before the start of every flashblock a
 To run op-rbuilder with flashtestations:
 
 ```bash
-cargo run -p op-rbuilder --bin op-rbuilder --features=flashtestations -- node \
+cargo run -p op-rbuilder --bin op-rbuilder -- node \
     --chain /path/to/chain-config.json \
     --http \
     --authrpc.port 9551 \
@@ -73,7 +73,7 @@ cargo run -p op-rbuilder --bin op-rbuilder --features=flashtestations -- node \
     --flashtestations.funding-amount 0.01 \ # amount in ETH to fund the TEE generated key
     --flashtestations.funding-key secret-key \ # funding key for the TEE key
     --flashtestations.registry-address 0xFlashtestationsRegistryAddress \
-    flashtestations.builder-policy-address 0xBuilderPolicyAddress
+    --flashtestations.builder-policy-address 0xBuilderPolicyAddress
 ```
 
 Note that `--rollup.builder-secret-key` must be set and funded in order for the flashtestations key to be funded and submit the attestation on-chain.

crates/op-rbuilder/Cargo.toml

@@ -192,6 +192,9 @@ testing = [
     "ctor",
     "macros",
     "rlimit",
+    "hyper",
+    "hyper-util",
+    "http-body-util",
 ]
 
 interop = []

crates/op-rbuilder/src/flashtestations/attestation.rs

@@ -33,7 +33,7 @@ impl RemoteAttestationProvider {
         let report_data_hex = hex::encode(report_data);
         let url = format!("{}/{}", self.service_url, report_data_hex);
 
-        info!(target: "flashtestations", url = url, "fetching quote in debug mode");
+        info!(target: "flashtestations", url = url, "fetching quote from remote attestation provider");
 
         let response = self
             .client

crates/op-rbuilder/src/flashtestations/builder_tx.rs

@@ -17,7 +17,7 @@ use revm::{
     inspector::NoOpInspector,
     state::Account,
 };
-use std::sync::OnceLock;
+use std::sync::{Arc, atomic::AtomicBool};
 use tracing::{debug, info};
 
 use crate::{
@@ -66,7 +66,7 @@ pub struct FlashtestationsBuilderTx {
     // Builder proof version
     builder_proof_version: u8,
     // Whether the workload and address has been registered
-    registered: OnceLock<bool>,
+    registered: Arc<AtomicBool>,
     // Whether block proofs are enabled
     enable_block_proofs: bool,
 }
@@ -91,7 +91,7 @@ impl FlashtestationsBuilderTx {
             registry_address: args.registry_address,
             builder_policy_address: args.builder_policy_address,
             builder_proof_version: args.builder_proof_version,
-            registered: OnceLock::new(),
+            registered: Arc::new(AtomicBool::new(args.registered)),
             enable_block_proofs: args.enable_block_proofs,
         }
     }
@@ -178,7 +178,7 @@ impl FlashtestationsBuilderTx {
     /// keccak256(abi.encode(parentHash, blockNumber, timestamp, transactionHashes))
     /// https://github.com/flashbots/rollup-boost/blob/main/specs/flashtestations.md#block-building-process
     fn compute_block_content_hash(
-        transactions: Vec<OpTransactionSigned>,
+        transactions: &[OpTransactionSigned],
         parent_hash: B256,
         block_number: u64,
         timestamp: u64,
@@ -475,7 +475,7 @@ impl FlashtestationsBuilderTx {
         >,
     ) -> Result<Option<BuilderTransactionCtx>, BuilderTransactionError> {
         let block_content_hash = Self::compute_block_content_hash(
-            transactions.clone(),
+            &transactions,
             ctx.parent_hash(),
             ctx.block_number(),
             ctx.timestamp(),
@@ -545,11 +545,12 @@ impl FlashtestationsBuilderTx {
         match self.register_tee_service_tx(ctx, &mut evm) {
             Ok((_, registered)) => {
                 if registered {
-                    let _ = self.registered.set(registered);
+                    self.registered
+                        .store(true, std::sync::atomic::Ordering::SeqCst);
                 }
                 Ok(())
             }
-            Err(e) => Err(BuilderTransactionError::other(e)),
+            Err(e) => Err(e),
         }
     }
 }
@@ -563,7 +564,7 @@ impl<ExtraCtx: Debug + Default> BuilderTransactions<ExtraCtx> for Flashtestation
         db: &mut State<impl Database>,
     ) -> Result<Vec<BuilderTransactionCtx>, BuilderTransactionError> {
         // set registered simulating against the committed state
-        if !self.registered.get().unwrap_or(&false) {
+        if !self.registered.load(std::sync::atomic::Ordering::SeqCst) {
             self.set_registered(state_provider.clone(), ctx)?;
         }
 
@@ -583,7 +584,7 @@ impl<ExtraCtx: Debug + Default> BuilderTransactions<ExtraCtx> for Flashtestation
 
         let mut builder_txs = Vec::<BuilderTransactionCtx>::new();
 
-        if !self.registered.get().unwrap_or(&false) {
+        if !self.registered.load(std::sync::atomic::Ordering::SeqCst) {
             info!(target: "flashtestations", "tee service not registered yet, attempting to register");
             builder_txs.extend(self.fund_tee_service_tx(ctx, &mut evm)?);
             let (register_tx, _) = self.register_tee_service_tx(ctx, &mut evm)?;

crates/op-rbuilder/src/tests/flashblocks.rs

@@ -1,25 +1,19 @@
 use alloy_consensus::Transaction;
 use alloy_eips::Decodable2718;
-use alloy_primitives::{Address, TxHash, U256, address, b128, b256};
+use alloy_primitives::{Address, TxHash, U256};
 use alloy_provider::Provider;
-use alloy_sol_types::SolCall;
 use macros::rb_test;
 use op_alloy_consensus::OpTxEnvelope;
 use std::time::Duration;
 
 use crate::{
     args::{FlashblocksArgs, OpRbuilderArgs},
     tests::{
-        BUILDER_PRIVATE_KEY, BlockTransactionsExt, BundleOpts, ChainDriver, ChainDriverExt,
-        FUNDED_PRIVATE_KEY, LocalInstance, ONE_ETH, TransactionBuilderExt,
-        flashblocks_number_contract::FlashblocksNumber,
+        BlockTransactionsExt, BundleOpts, ChainDriver, FLASHBLOCKS_NUMBER_ADDRESS, LocalInstance,
+        TransactionBuilderExt, flashblocks_number_contract::FlashblocksNumber,
     },
-    tx_signer::Signer,
 };
 
-// If the order of deployment from the signer changes the address will change
-const FLASHBLOCKS_NUMBER_ADDRESS: Address = address!("5fbdb2315678afecb367f032d93f642f64180aa3");
-
 #[rb_test(flashblocks, args = OpRbuilderArgs {
     chain_block_time: 2000,
     flashblocks: FlashblocksArgs {