Merge pull request #34 from worldcoin/0xkitsune/forward-tx

Forward transactions to the Sequencer after validation

world-chain-builder/src/rpc/transaction.rs

@@ -32,25 +32,26 @@ where
     async fn send_raw_transaction(&self, tx: Bytes) -> Result<B256, Self::Error> {
         let (recovered, inner_tx) = recover_raw_transaction(tx.clone())?;
         let pool_transaction = <Self::Pool as TransactionPool>::Transaction::from_pooled(recovered);
+        let pbh_tx = pool_transaction.semaphore_proof.is_some();
+
+        // submit the transaction to the pool with a `Local` origin
+        let hash = self
+            .pool()
+            .add_transaction(TransactionOrigin::Local, pool_transaction)
+            .await
+            .map_err(Self::Error::from_eth_err)?;
 
         // On optimism, transactions are forwarded directly to the sequencer to be included in
         // blocks that it builds.
         if let Some(client) = self.raw_tx_forwarder().as_ref() {
-            if pool_transaction.semaphore_proof.is_none() {
+            if !pbh_tx {
                 tracing::debug!( target: "rpc::eth",  "forwarding raw transaction to");
                 let _ = client.forward_raw_transaction(&inner_tx).await.inspect_err(|err| {
-                    tracing::debug!(target: "rpc::eth", %err, hash=% *pool_transaction.hash(), "failed to forward raw transaction");
+                    tracing::debug!(target: "rpc::eth", %err, hash=?*hash, "failed to forward raw transaction");
                 });
             }
         }
 
-        // submit the transaction to the pool with a `Local` origin
-        let hash = self
-            .pool()
-            .add_transaction(TransactionOrigin::Local, pool_transaction)
-            .await
-            .map_err(Self::Error::from_eth_err)?;
-
         Ok(hash)
     }
 }