update code to latest flashtestations contract changes

Author: avalonche

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

@@ -38,6 +38,7 @@ use crate::{
 
 pub struct FlashtestationsBuilderTxArgs {
     pub attestation: Vec<u8>,
+    pub extra_registration_data: Bytes,
     pub tee_service_signer: Signer,
     pub funding_key: Signer,
     pub funding_amount: U256,
@@ -52,6 +53,8 @@ pub struct FlashtestationsBuilderTxArgs {
 pub struct FlashtestationsBuilderTx {
     // Attestation for the builder
     attestation: Vec<u8>,
+    // Extra registration data for the builder
+    extra_registration_data: Bytes,
     // TEE service generated key
     tee_service_signer: Signer,
     // Funding key for the TEE signer
@@ -83,6 +86,7 @@ impl FlashtestationsBuilderTx {
     pub fn new(args: FlashtestationsBuilderTxArgs) -> Self {
         Self {
             attestation: args.attestation,
+            extra_registration_data: args.extra_registration_data,
             tee_service_signer: args.tee_service_signer,
             funding_key: args.funding_key,
             funding_amount: args.funding_amount,
@@ -128,6 +132,7 @@ impl FlashtestationsBuilderTx {
         let quote_bytes = Bytes::from(attestation);
         let calldata = IFlashtestationRegistry::registerTEEServiceCall {
             rawQuote: quote_bytes,
+            extendedRegistrationData: self.extra_registration_data.clone(),
         }
         .abi_encode();
 
@@ -438,7 +443,7 @@ impl FlashtestationsBuilderTx {
                 ))
             }
         } else if let Some(FlashtestationRevertReason::FlashtestationRegistry(
-            FlashtestationRegistryError::TEEServiceAlreadyRegistered(_, _),
+            FlashtestationRegistryError::TEEServiceAlreadyRegistered(_),
         )) = revert_reason
         {
             Ok((None, true))

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

@@ -4,7 +4,7 @@ use alloy_sol_types::{sol, SolError};
 sol!(
     #[sol(rpc, abi)]
     interface IFlashtestationRegistry {
-        function registerTEEService(bytes calldata rawQuote) external;
+        function registerTEEService(bytes calldata rawQuote, bytes calldata extendedRegistrationData) external;
     }
 
     #[sol(rpc, abi)]
@@ -21,18 +21,20 @@ sol!(
 
     type WorkloadId is bytes32;
 
-    event TEEServiceRegistered(
-        address teeAddress, WorkloadId workloadId, bytes rawQuote, bytes publicKey, bool alreadyExists
-    );
+    event TEEServiceRegistered(address teeAddress, bytes rawQuote, bool alreadyExists);
 
     event BlockBuilderProofVerified(
         address caller, WorkloadId workloadId, uint256 blockNumber, uint8 version, bytes32 blockContentHash
     );
 
     // FlashtestationRegistry errors
     error InvalidQuote(bytes output);
-    error TEEServiceAlreadyRegistered(address teeAddress, WorkloadId workloadId);
+    error TEEServiceAlreadyRegistered(address teeAddress);
+    error InvalidRegistrationDataHash(bytes32 expected, bytes32 received);
     error SenderMustMatchTEEAddress(address sender, address teeAddress);
+    error ByteSizeExceeded(uint256 size);
+
+    // QuoteParser errors
     error InvalidTEEType(bytes4 teeType);
     error InvalidTEEVersion(uint16 version);
     error InvalidReportDataLength(uint256 length);
@@ -61,8 +63,12 @@ pub enum FlashtestationRevertReason {
 pub enum FlashtestationRegistryError {
     #[error("invalid quote: {0}")]
     InvalidQuote(Bytes),
-    #[error("tee address {0} already registered with workload id {1}")]
-    TEEServiceAlreadyRegistered(Address, B256),
+    #[error("tee address {0} already registered")]
+    TEEServiceAlreadyRegistered(Address),
+    #[error("invalid registration data hash: expected {0}, received {1}")]
+    InvalidRegistrationDataHash(B256, B256),
+    #[error("byte size exceeded: {0}")]
+    ByteSizeExceeded(U256),
     #[error("sender address {0} must match quote tee address {1}")]
     SenderMustMatchTEEAddress(Address, Address),
     #[error("invalid tee type: {0}")]
@@ -95,14 +101,20 @@ impl From<Bytes> for FlashtestationRegistryError {
             return FlashtestationRegistryError::InvalidQuote(output);
         }
 
-        if let Ok(TEEServiceAlreadyRegistered {
-            teeAddress,
-            workloadId,
-        }) = TEEServiceAlreadyRegistered::abi_decode(&value)
+        if let Ok(TEEServiceAlreadyRegistered { teeAddress }) =
+            TEEServiceAlreadyRegistered::abi_decode(&value)
         {
-            return FlashtestationRegistryError::TEEServiceAlreadyRegistered(
-                teeAddress, workloadId,
-            );
+            return FlashtestationRegistryError::TEEServiceAlreadyRegistered(teeAddress);
+        }
+
+        if let Ok(InvalidRegistrationDataHash { expected, received }) =
+            InvalidRegistrationDataHash::abi_decode(&value)
+        {
+            return FlashtestationRegistryError::InvalidRegistrationDataHash(expected, received);
+        }
+
+        if let Ok(ByteSizeExceeded { size }) = ByteSizeExceeded::abi_decode(&value) {
+            return FlashtestationRegistryError::ByteSizeExceeded(size);
         }
 
         if let Ok(SenderMustMatchTEEAddress { sender, teeAddress }) =

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

@@ -1,3 +1,4 @@
+use alloy_primitives::{keccak256, Bytes};
 use reth_node_builder::BuilderContext;
 use tracing::{info, warn};
 
@@ -51,10 +52,26 @@ where
         quote_provider: args.quote_provider,
     });
 
-    // Prepare report data with public key (64 bytes, no 0x04 prefix)
+    // Prepare report data:
+    // - TEE address (20 bytes) at reportData[0:20]
+    // - Extended registration data hash (32 bytes) at reportData[20:52]
+    // - Total: 52 bytes, padded to 64 bytes with zeros
+
+    // Extract TEE address as 20 bytes
+    let tee_address_bytes: [u8; 20] = tee_service_signer.address.into();
+
+    // Calculate keccak256 hash of empty bytes (32 bytes)
+    let ext_data = Bytes::from(b"");
+    let ext_data_hash = keccak256(&ext_data);
+
+    // Create 64-byte report data array
     let mut report_data = [0u8; 64];
-    let pubkey_uncompressed = tee_service_signer.pubkey.serialize_uncompressed();
-    report_data.copy_from_slice(&pubkey_uncompressed[1..65]); // Skip 0x04 prefix
+
+    // Copy TEE address (20 bytes) to positions 0-19
+    report_data[0..20].copy_from_slice(&tee_address_bytes);
+
+    // Copy extended registration data hash (32 bytes) to positions 20-51
+    report_data[20..52].copy_from_slice(ext_data_hash.as_ref());
 
     // Request TDX attestation
     info!(target: "flashtestations", "requesting TDX attestation");
@@ -69,7 +86,11 @@ where
         );
         // Submit report onchain by registering the key of the tee service
         match tx_manager
-            .fund_and_register_tee_service(attestation.clone(), args.funding_amount)
+            .fund_and_register_tee_service(
+                attestation.clone(),
+                ext_data.clone(),
+                args.funding_amount,
+            )
             .await
         {
             Ok(_) => (Some(tx_manager), true),
@@ -84,6 +105,7 @@ where
 
     let flashtestations_builder_tx = FlashtestationsBuilderTx::new(FlashtestationsBuilderTxArgs {
         attestation,
+        extra_registration_data: ext_data,
         tee_service_signer,
         funding_key,
         funding_amount: args.funding_amount,
@@ -115,48 +137,3 @@ where
 
     Ok(flashtestations_builder_tx)
 }
-
-#[cfg(test)]
-mod tests {
-    use alloy_primitives::Address;
-    use secp256k1::{PublicKey, Secp256k1, SecretKey};
-    use sha3::{Digest, Keccak256};
-
-    use crate::tx_signer::public_key_to_address;
-
-    /// Derives Ethereum address from report data using the same logic as the Solidity contract
-    fn derive_ethereum_address_from_report_data(pubkey_64_bytes: &[u8]) -> Address {
-        // This exactly matches the Solidity implementation:
-        // address(uint160(uint256(keccak256(reportData))))
-
-        // Step 1: keccak256(reportData)
-        let hash = Keccak256::digest(pubkey_64_bytes);
-
-        // Step 2: Take last 20 bytes (same as uint256 -> uint160 conversion)
-        let mut address_bytes = [0u8; 20];
-        address_bytes.copy_from_slice(&hash[12..32]);
-
-        Address::from(address_bytes)
-    }
-
-    #[test]
-    fn test_address_derivation_matches() {
-        // Test that our manual derivation is correct
-        let secp = Secp256k1::new();
-        let private_key = SecretKey::from_slice(&[0x01; 32]).unwrap();
-        let public_key = PublicKey::from_secret_key(&secp, &private_key);
-
-        // Get address using our implementation
-        let our_address = public_key_to_address(&public_key);
-
-        // Get address using our manual derivation (matching Solidity)
-        let pubkey_bytes = public_key.serialize_uncompressed();
-        let report_data = &pubkey_bytes[1..65]; // Skip 0x04 prefix
-        let manual_address = derive_ethereum_address_from_report_data(report_data);
-
-        assert_eq!(
-            our_address, manual_address,
-            "Address derivation should match"
-        );
-    }
-}

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

@@ -102,6 +102,7 @@ impl TxManager {
     pub async fn fund_and_register_tee_service(
         &self,
         attestation: Vec<u8>,
+        extra_registration_data: Bytes,
         funding_amount: U256,
     ) -> Result<(), TxManagerError> {
         info!(target: "flashtestations", "funding TEE address at {}", self.tee_service_signer.address);
@@ -133,6 +134,7 @@ impl TxManager {
 
         let calldata = IFlashtestationRegistry::registerTEEServiceCall {
             rawQuote: quote_bytes,
+            extendedRegistrationData: extra_registration_data,
         }
         .abi_encode();
         let tx = TransactionRequest {