Implement txGasPrice in PVM mode (#380)

* Implementation

* Revert cheatcodes module to private

* Removed unnecessary overwrite and added tests for txGasPrice

* fmt

* Set effective_gas_price in ExecConfig for PVM CREATE/CALL

Author: filip-parity

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

@@ -8,3 +8,4 @@ pub mod cheat_mock_functions;
 pub mod cheat_prank;
 pub mod cheat_store;
 pub mod migration;
+pub mod tx_gas_price;

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

@@ -0,0 +1,60 @@
+use crate::{config::*, test_helpers::TEST_DATA_REVIVE};
+use foundry_test_utils::Filter;
+use revive_strategy::ReviveRuntimeMode;
+use revm::primitives::hardfork::SpecId;
+use rstest::rstest;
+
+#[rstest]
+#[case::pvm(ReviveRuntimeMode::Pvm)]
+#[case::evm(ReviveRuntimeMode::Evm)]
+#[tokio::test(flavor = "multi_thread")]
+async fn test_tx_gas_price_works(#[case] runtime_mode: ReviveRuntimeMode) {
+    let runner: forge::MultiContractRunner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
+    let filter = Filter::new("testTxGasPriceWorks", "TxGasPrice", ".*/revive/.*");
+
+    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_tx_gas_price_works_with_zero(#[case] runtime_mode: ReviveRuntimeMode) {
+    let runner: forge::MultiContractRunner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
+    let filter = Filter::new("testTxGasPriceWorksWithZero", "TxGasPrice", ".*/revive/.*");
+
+    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_tx_gas_price_works_with_large_value(#[case] runtime_mode: ReviveRuntimeMode) {
+    let runner: forge::MultiContractRunner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
+    let filter = Filter::new("testTxGasPriceWorksWithLargeValue", "TxGasPrice", ".*/revive/.*");
+
+    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_tx_gas_price_works_in_both_modes(#[case] runtime_mode: ReviveRuntimeMode) {
+    let runner: forge::MultiContractRunner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
+    let filter = Filter::new("testTxGasPriceWorksInBothModes", "TxGasPrice", ".*/revive/.*");
+
+    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_tx_gas_price_preserved_in_pvm_contract(#[case] runtime_mode: ReviveRuntimeMode) {
+    let runner: forge::MultiContractRunner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
+    let filter = Filter::new("testTxGasPricePreservedInPvmContract", "TxGasPrice", ".*/revive/.*");
+
+    TestConfig::with_filter(runner, filter).spec_id(SpecId::PRAGUE).run().await;
+}

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

@@ -851,6 +851,8 @@ impl foundry_cheatcodes::CheatcodeInspectorStrategyExt for PvmCheatcodeInspector
             }
         };
 
+        let gas_price_pvm =
+            sp_core::U256::from_little_endian(&U256::from(ecx.tx.gas_price).as_le_bytes());
         let mut tracer = Tracer::new(true);
         let res = execute_with_externalities(|externalities| {
             externalities.execute_with(|| {
@@ -871,7 +873,7 @@ impl foundry_cheatcodes::CheatcodeInspectorStrategyExt for PvmCheatcodeInspector
                     let exec_config = ExecConfig {
                         bump_nonce: true,
                         collect_deposit_from_hold: None,
-                        effective_gas_price: Some(<Pallet<Runtime>>::evm_base_fee()),
+                        effective_gas_price: Some(gas_price_pvm),
                         mock_handler: Some(Box::new(mock_handler.clone())),
                         is_dry_run: false,
                     };
@@ -993,6 +995,8 @@ impl foundry_cheatcodes::CheatcodeInspectorStrategyExt for PvmCheatcodeInspector
 
         tracing::info!("running call on pallet-revive with {} {:#?}", ctx.runtime_mode, call);
 
+        let gas_price_pvm =
+            sp_core::U256::from_little_endian(&U256::from(ecx.tx.gas_price).as_le_bytes());
         let mock_handler = MockHandlerImpl::new(
             &ecx,
             &call.caller,
@@ -1017,7 +1021,7 @@ impl foundry_cheatcodes::CheatcodeInspectorStrategyExt for PvmCheatcodeInspector
                     let exec_config = ExecConfig {
                         bump_nonce: true,
                         collect_deposit_from_hold: None,
-                        effective_gas_price: Some(<Pallet<Runtime>>::evm_base_fee()),
+                        effective_gas_price: Some(gas_price_pvm),
                         mock_handler: Some(Box::new(mock_handler.clone())),
                         is_dry_run: false,
                     };

testdata/default/revive/TxGasPrice.t.sol

@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity ^0.8.18;
+
+import "ds-test/test.sol";
+import "cheats/Vm.sol";
+
+contract GasPriceChecker {
+    function getGasPrice() public view returns (uint256) {
+        return tx.gasprice;
+    }
+}
+
+contract TxGasPriceTest is DSTest {
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    function testTxGasPriceWorks() public {
+        // Set a new gas price
+        uint256 newGasPrice = 100_000_000_000; // 100 gwei
+        vm.txGasPrice(newGasPrice);
+
+        // Verify the gas price was updated
+        assertEq(tx.gasprice, newGasPrice, "gas price should be updated");
+    }
+
+    function testTxGasPriceWorksWithZero() public {
+        // Set gas price to zero
+        vm.txGasPrice(0);
+
+        // Verify the gas price was updated to zero
+        assertEq(tx.gasprice, 0, "gas price should be zero");
+    }
+
+    function testTxGasPriceWorksWithLargeValue() public {
+        uint256 largeGasPrice = 1_000_000_000_000_000; // 1 million gwei
+        vm.txGasPrice(largeGasPrice);
+
+        // Verify the gas price was updated
+        assertEq(tx.gasprice, largeGasPrice, "gas price should be updated to large value");
+    }
+
+    function testTxGasPriceWorksInBothModes() public {
+        // Test in EVM mode
+        vm.pvm(false);
+        uint256 evmGasPrice = 50_000_000_000; // 50 gwei
+        vm.txGasPrice(evmGasPrice);
+        assertEq(tx.gasprice, evmGasPrice, "gas price should work in EVM mode");
+
+        // Test in PVM mode
+        vm.pvm(true);
+        uint256 pvmGasPrice = 75_000_000_000; // 75 gwei
+        vm.txGasPrice(pvmGasPrice);
+        assertEq(tx.gasprice, pvmGasPrice, "gas price should work in PVM mode");
+    }
+
+    function testTxGasPricePreservedInPvmContract() public {
+        // Set gas price in EVM mode
+        vm.pvm(false);
+        uint256 evmGasPrice = 50_000_000_000; // 50 gwei
+        vm.txGasPrice(evmGasPrice);
+
+        // Switch to PVM mode (gas price should be preserved)
+        vm.pvm(true);
+
+        // Deploy a contract in PVM mode - it should see the preserved gas price
+        GasPriceChecker checker = new GasPriceChecker();
+
+        // Call the contract - it should see the same gas price
+        uint256 gasPriceFromContract = checker.getGasPrice();
+        assertEq(gasPriceFromContract, evmGasPrice, "gas price should be preserved in PVM contract");
+    }
+}