Enable eth_call state override (#2219)

node/service/src/rpc.rs

@@ -48,7 +48,7 @@ use sc_rpc_api::DenyUnsafe;
 use sc_service::TaskManager;
 use sc_transaction_pool::{ChainApi, Pool};
 use sc_transaction_pool_api::TransactionPool;
-use sp_api::{HeaderT, ProvideRuntimeApi};
+use sp_api::{CallApiAt, HeaderT, ProvideRuntimeApi};
 use sp_blockchain::{
 	Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata,
 };
@@ -78,6 +78,18 @@ impl fc_rpc::EstimateGasAdapter for MoonbeamEGA {
 	}
 }
 
+pub struct MoonbeamEthConfig<C, BE>(std::marker::PhantomData<(C, BE)>);
+
+impl<C, BE> fc_rpc::EthConfig<Block, C> for MoonbeamEthConfig<C, BE>
+where
+	C: sc_client_api::StorageProvider<Block, BE> + Sync + Send + 'static,
+	BE: Backend<Block> + 'static,
+{
+	type EstimateGasAdapter = MoonbeamEGA;
+	type RuntimeStorageOverride =
+		fc_rpc::frontier_backend_client::SystemAccountId20StorageOverride<Block, C, BE>;
+}
+
 /// Full client dependencies.
 pub struct FullDeps<C, P, A: ChainApi, BE> {
 	/// The client instance to use.
@@ -162,6 +174,7 @@ where
 	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,
 	C: BlockchainEvents<Block>,
 	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,
+	C: CallApiAt<Block>,
 	C: Send + Sync + 'static,
 	A: ChainApi<Block = Block> + 'static,
 	C::Api: RuntimeApiCollection<StateBackend = BE::State>,
@@ -233,7 +246,7 @@ where
 			fee_history_limit,
 			10,
 		)
-		.with_estimate_gas_adapter::<MoonbeamEGA>()
+		.replace_config::<MoonbeamEthConfig<C, BE>>()
 		.into_rpc(),
 	)?;
 

tests/contracts/solidity/StateOverrideTest.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity >=0.8.0;
+
+/// @notice Smart contract to help test state override
+contract StateOverrideTest {
+    /// @notice The maxmium allowed value
+    uint256 public MAX_ALLOWED = 3;
+    uint256 public availableFunds;
+    mapping(address => mapping(address => uint256)) public allowance;
+
+    address owner;
+
+    constructor(uint256 intialAmount) payable {
+        owner = msg.sender;
+        availableFunds = intialAmount;
+    }
+
+    function getBalance() external view returns (uint256) {
+        return address(this).balance;
+    }
+
+    function getSenderBalance() external view returns (uint256) {
+        return address(msg.sender).balance;
+    }
+
+    function getAllowance(address from, address who)
+        external
+        view
+        returns (uint256)
+    {
+        return allowance[from][who];
+    }
+
+    function setAllowance(address who, uint256 amount) external {
+        allowance[address(msg.sender)][who] = amount;
+    }
+}