Refactor anchor transaction handling for improved code readability an…

…d maintainability
taikoxyz · Jul 8, 2024 · 920038e · 920038e
1 parent a93d974
commit 920038e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crates/taiko/evm/src/anchor.rs b/crates/taiko/evm/src/anchor.rs
@@ -85,7 +85,7 @@ pub fn check_anchor_tx(
     check_anchor_signature(tx).context(anyhow!("failed to check anchor signature"))?;
 
     // Extract the `to` address
-    let TxKind::Call(to) = anchor.to else { panic!("anchor tx not a smart contract call") };
+    let TxKind::Call(to) = anchor.to else { bail!("anchor tx not a smart contract call") };
     // Check that it's from the golden touch address
     ensure!(*from == *GOLDEN_TOUCH_ACCOUNT, "anchor transaction from mismatch");
     // Check that the L2 contract is being called

diff --git a/crates/taiko/payload/builder/src/builder.rs b/crates/taiko/payload/builder/src/builder.rs
@@ -498,14 +498,14 @@ fn check_anchor_tx(
     base_fee_per_gas: u128,
     chain_spec: &Arc<ChainSpec>,
 ) -> anyhow::Result<()> {
-    use anyhow::{anyhow, ensure, Context};
+    use anyhow::{anyhow, bail, ensure, Context};
     let anchor = tx.as_eip1559().context(anyhow!("anchor tx is not an EIP1559 tx"))?;
 
     // Check the signature
     check_anchor_signature(tx).context(anyhow!("failed to check anchor signature"))?;
 
     // Extract the `to` address
-    let TxKind::Call(to) = anchor.to else { panic!("anchor tx not a smart contract call") };
+    let TxKind::Call(to) = anchor.to else { bail!("anchor tx not a smart contract call") };
     // Check that the L2 contract is being called
     ensure!(to == chain_spec.l2_contract.unwrap(), "anchor transaction to mismatch");
     // Check that it's from the golden touch address