Add support for non default gas values (eth_estimateGas & zks_estimateFee)

.vscode/extensions.json

@@ -2,5 +2,6 @@
 	"recommendations": [
 		"rust-lang.rust-analyzer",
 		"humao.rest-client",
+		"vadimcn.vscode-lldb"
 	],
 }

Makefile

@@ -26,6 +26,11 @@ lint:
 	cargo fmt --all -- --check
 	cargo clippy -Zunstable-options -- -D warnings --allow clippy::unwrap_used
 
+# Fix lint errors for Rust code
+lint-fix:
+	cargo clippy --fix
+	cargo fmt
+
 # Run unit tests for Rust code
 test:
 	cargo test

SUPPORTED_APIS.md

@@ -43,7 +43,7 @@
 | `EVM` | `evm_setTime` | NOT IMPLEMENTED | Sets the internal clock time to the given timestamp |
 | `EVM` | `evm_snapshot` | NOT IMPLEMENTED | Snapshot the state of the blockchain at the current block |
 | [`ETH`](#eth-namespace) | [`eth_chainId`](#eth_chainid) | SUPPORTED | Returns the currently configured chain id |
-| [`ETH`](#eth-namespace) | [`eth_estimateGas`](#eth_estimategas) | PARTIALLY | Generates and returns an estimate of how much gas is necessary for the transaction to complete |
+| [`ETH`](#eth-namespace) | [`eth_estimateGas`](#eth_estimategas) | SUPPORTED | Generates and returns an estimate of how much gas is necessary for the transaction to complete |
 | [`ETH`](#eth-namespace) | [`eth_gasPrice`](#eth_gasprice) | SUPPORTED | Returns the current price per gas in wei |
 | [`ETH`](#eth-namespace) | [`eth_getBalance`](#eth_getbalance) | SUPPORTED | Returns the balance of the account of given address |
 | [`ETH`](#eth-namespace) | [`eth_getBlockByNumber`](#eth_getblockbynumber) | PARTIALLY | Returns information about a block by block number |

src/deps/mod.rs

@@ -11,7 +11,7 @@ use std::fmt;
 use self::system_contracts::COMPILED_IN_SYSTEM_CONTRACTS;
 
 /// In-memory storage.
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct InMemoryStorage {
     pub(crate) state: HashMap<StorageKey, StorageValue>,
     pub(crate) factory_deps: HashMap<H256, Vec<u8>>,

src/fork.rs

@@ -52,6 +52,16 @@ pub struct ForkStorage {
     pub chain_id: L2ChainId,
 }
 
+impl Clone for ForkStorage {
+    fn clone(&self) -> Self {
+        let inner = Arc::new(RwLock::new(self.inner.read().unwrap().clone()));
+        Self {
+            inner,
+            chain_id: self.chain_id,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ForkStorageInner {
     // Underlying local storage
@@ -65,6 +75,17 @@ pub struct ForkStorageInner {
     pub fork: Option<ForkDetails>,
 }
 
+impl Clone for ForkStorageInner {
+    fn clone(&self) -> Self {
+        Self {
+            raw_storage: self.raw_storage.clone(),
+            value_read_cache: self.value_read_cache.clone(),
+            factory_dep_cache: self.factory_dep_cache.clone(),
+            fork: self.fork.clone(),
+        }
+    }
+}
+
 impl ForkStorage {
     pub fn new(fork: Option<ForkDetails>, dev_use_local_contracts: bool) -> Self {
         let chain_id = fork

src/main.rs

@@ -108,6 +108,7 @@ async fn build_json_http(
     node: InMemoryNode,
     net: NetNamespace,
     config_api: ConfigurationApiNamespace,
+    zks: ZkMockNamespaceImpl,
 ) -> tokio::task::JoinHandle<()> {
     let (sender, recv) = oneshot::channel::<()>();
 
@@ -116,7 +117,7 @@ async fn build_json_http(
         io.extend_with(node.to_delegate());
         io.extend_with(net.to_delegate());
         io.extend_with(config_api.to_delegate());
-        io.extend_with(ZkMockNamespaceImpl.to_delegate());
+        io.extend_with(zks.to_delegate());
 
         io
     };
@@ -292,14 +293,15 @@ async fn main() -> anyhow::Result<()> {
     }
 
     let net = NetNamespace::new(L2ChainId(TEST_NODE_NETWORK_ID));
-
     let config_api = ConfigurationApiNamespace::new(node.get_inner());
+    let zks = ZkMockNamespaceImpl::new(node.get_inner());
 
     let threads = build_json_http(
         SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), opt.port),
         node,
         net,
         config_api,
+        zks,
     )
     .await;