Allow calls to external libraries

Author: grandizzy

crates/evm/evm/src/inspectors/script.rs

@@ -14,11 +14,13 @@ pub struct ScriptExecutionInspector {
 }
 
 impl<DB: Database> Inspector<DB> for ScriptExecutionInspector {
-    #[cold]
+    #[inline]
     fn step(&mut self, interpreter: &mut Interpreter, _ecx: &mut EvmContext<DB>) {
-        // Check for address(this) usage in the main script contract
+        // Check if both target and bytecode address are the same as script contract address
+        // (allow calling external libraries when bytecode address is different).
         if interpreter.current_opcode() == ADDRESS &&
-            interpreter.contract.target_address == self.script_address
+            interpreter.contract.target_address == self.script_address &&
+            interpreter.contract.bytecode_address.unwrap_or_default() == self.script_address
         {
             // Log the reason for revert
             tracing::error!(

crates/evm/evm/src/inspectors/stack.rs

@@ -789,16 +789,6 @@ impl Inspector<&mut dyn DatabaseExt> for InspectorStackRefMut<'_> {
             ],
             |inspector| inspector.step(interpreter, ecx),
         );
-
-        // Check for address(this) usage in the main script contract, but ignore if it's within a DELEGATECALL context
-        if let Some(script_addr) = self.inner.script_address {
-            if interpreter.current_opcode() == opcode::ADDRESS &&
-               interpreter.contract.address == script_addr &&
-               interpreter.call_context().scheme != CallScheme::DelegateCall
-            {
-                tracing::warn!(target: "forge::script", script_address=%script_addr, "Usage of `address(this)` detected directly in script contract. Script contracts are ephemeral and their addresses should not be relied upon.");
-            }
-        }
     }
 
     fn step_end(

testdata/default/cheats/Broadcast.t.sol

@@ -112,8 +112,6 @@ contract BroadcastTest is DSTest {
 
         vm.stopBroadcast();
 
-        require(test.echoSender() == address(this));
-
         vm.broadcast(ACCOUNT_B);
         Test tmptest2 = new Test();
 
@@ -577,11 +575,6 @@ contract ScriptSign is DSTest {
         vm.startBroadcast();
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(digest);
 
-        vm._expectCheatcodeRevert(
-            bytes(string.concat("signer with address ", vm.toString(address(this)), " is not available"))
-        );
-        vm.sign(address(this), digest);
-
         SignatureTester tester = new SignatureTester();
         (, address caller,) = vm.readCallers();
         assertEq(tester.owner(), caller);