Extract caller address from tx

anthias-labs · May 31, 2024 · 659f7a1 · 659f7a1
1 parent 5c131d9
commit 659f7a1
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/src/middleware/mod.rs b/core/src/middleware/mod.rs
@@ -426,8 +426,15 @@ impl Middleware for ArbiterMiddleware {
             Some(&to) => TransactTo::Call(to.to_fixed_bytes().into()),
             None => TransactTo::Create(CreateScheme::Create),
         };
+
+        // Extract `from` field if it exists
+        let caller = match tx.from() {
+            Some(&from) => from.to_fixed_bytes().into(),
+            None => self.address().to_fixed_bytes().into(),
+        };
+
         let tx_env = TxEnv {
-            caller: self.address().to_fixed_bytes().into(),
+            caller,
             gas_limit: u64::MAX,
             gas_price: revm::primitives::U256::from_limbs(self.get_gas_price().await?.0),
             gas_priority_fee: None,