Add check for cheatcodes usage in pallet-revive

crates/forge/tests/it/revive/migration.rs

@@ -152,6 +152,20 @@ async fn test_contract_deployment_in_different_modes(#[case] runtime_mode: Reviv
     TestConfig::with_filter(runner, filter).spec_id(SpecId::PRAGUE).run().await;
 }
 
+#[rstest]
+#[case::pvm(ReviveRuntimeMode::Pvm)]
+#[case::evm(ReviveRuntimeMode::Evm)]
+#[tokio::test(flavor = "multi_thread")]
+async fn test_cheatcode_access_restriction(#[case] runtime_mode: ReviveRuntimeMode) {
+    let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
+    let filter = Filter::new(
+        "testScriptCheatcodesShouldFailInPolkadotMode",
+        "CheatcodeAccessRestrictionTest",
+        ".*/revive/.*",
+    );
+    TestConfig::with_filter(runner, filter).spec_id(SpecId::PRAGUE).run().await;
+}
+
 #[rstest]
 #[case::pvm(ReviveRuntimeMode::Pvm)]
 #[case::evm(ReviveRuntimeMode::Evm)]

crates/revive-strategy/src/cheatcodes/mock_handler.rs

@@ -6,6 +6,7 @@ use std::{
 
 use alloy_primitives::{Address, Bytes, map::foldhash::HashMap, ruint::aliases::U256};
 use foundry_cheatcodes::{Ecx, MockCallDataContext, MockCallReturnData};
+use foundry_evm::constants::CHEATCODE_ADDRESS;
 use polkadot_sdk::{
     frame_system,
     pallet_revive::{
@@ -81,6 +82,14 @@ impl MockHandler<Runtime> for MockHandlerImpl {
         call_data: &[u8],
         value_transferred: polkadot_sdk::pallet_revive::U256,
     ) -> Option<pallet_revive::ExecReturnValue> {
+        // Check if trying to call cheatcode address from pallet-revive
+        if Address::from_slice(callee.as_bytes()) == CHEATCODE_ADDRESS {
+            return Some(ExecReturnValue {
+                flags: ReturnFlags::REVERT,
+                data: b"Cheatcodes are not available in polkadot runtime.".to_vec(),
+            });
+        }
+
         let mut mock_inner = self.inner.borrow_mut();
         let ctx = MockCallDataContext {
             calldata: call_data.to_vec().into(),

testdata/default/revive/CheatcodeAccessRestriction.t.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity ^0.8.18;
+
+import "ds-test/test.sol";
+import "cheats/Vm.sol";
+
+contract ScriptWithCheatcodes is DSTest {
+    address public derivedAddress;
+    uint256 private ownerKey;
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    function setUp() public {
+        // This pattern tries to use vm.envUint and vm.addr from a non-test contract
+        ownerKey = vm.envUint("TEST_OWNER_KEY");
+        derivedAddress = vm.addr(ownerKey);
+    }
+}
+
+contract CheatcodeAccessRestrictionTest is DSTest {
+    ScriptWithCheatcodes script;
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    function setUp() public {
+        vm.setEnv("TEST_OWNER_KEY", vm.toString(uint256(12345)));
+    }
+
+    function testScriptCheatcodesShouldFailInPolkadotMode() public {
+        script = new ScriptWithCheatcodes();
+        vm.expectRevert("Cheatcodes are not available in polkadot runtime.");
+        script.setUp();
+    }
+}