Commented out error logs; refactored contract handling

Author: johntaiko

crates/rpc/rpc-layer/src/jwt_validator.rs

@@ -1,7 +1,7 @@
 use crate::{AuthValidator, JwtError, JwtSecret};
 use http::{header, HeaderMap, Response, StatusCode};
 use jsonrpsee_http_client::{HttpBody, HttpResponse};
-use tracing::error;
+// use tracing::error;
 
 /// Implements JWT validation logics and integrates
 /// to an Http [`AuthLayer`][crate::AuthLayer]
@@ -26,14 +26,14 @@ impl AuthValidator for JwtAuthValidator {
             Some(jwt) => match self.secret.validate(&jwt) {
                 Ok(_) => Ok(()),
                 Err(e) => {
-                    error!(target: "engine::jwt-validator", "Invalid JWT: {e}");
+                    // error!(target: "engine::jwt-validator", "Invalid JWT: {e}");
                     let response = err_response(e);
                     Err(response)
                 }
             },
             None => {
                 let e = JwtError::MissingOrInvalidAuthorizationHeader;
-                error!(target: "engine::jwt-validator", "Invalid JWT: {e}");
+                // error!(target: "engine::jwt-validator", "Invalid JWT: {e}");
                 let response = err_response(e);
                 Err(response)
             }

crates/taiko/rpc/src/api.rs

@@ -415,7 +415,7 @@ where
                     this.eth_api.tx_resp_builder(),
                 )?;
 
-                let BundleState { state: bundle_state, contracts, .. } = state;
+                let BundleState { state: bundle_state, .. } = state;
 
                 let state = this.eth_api.state_at_block_id(block_hash.into())?;
                 let parent_state = db.db.into_inner();
@@ -437,6 +437,7 @@ where
 
                 let mut account_proofs = vec![];
                 let mut parent_account_proofs = vec![];
+                let mut contracts = HashMap::new();
 
                 for (address, account) in bundle_state {
                     let storage_keys: Vec<B256> =
@@ -453,17 +454,20 @@ where
                         .proof(Default::default(), address, storage_keys.as_slice())
                         .map_err(Eth::Error::from_eth_err)?;
                     account_proofs.push(proof.into_eip1186_response(keys));
+
+                    if let Some(original_info) = account.original_info {
+                        if let Some(code) = original_info.code {
+                            contracts.insert(original_info.code_hash, code.bytes());
+                        }
+                    }
                 }
 
                 Ok(ProvingPreflight {
                     block: rpc_block,
                     parent_header: rpc_parent_block.header,
                     account_proofs,
                     parent_account_proofs,
-                    contracts: contracts
-                        .into_iter()
-                        .map(|(k, v)| (k, v.original_bytes()))
-                        .collect(),
+                    contracts,
                     ancestor_headers,
                 })
             })