Merge branch 'main' into fix/bump-hh

.gitignore

@@ -12,3 +12,5 @@ etc/**/*.zbin
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/tasks.json
+
+*.log

Cargo.toml

@@ -44,4 +44,9 @@ serde_json = "1.0.67"
 bigdecimal = { version = "0.2.0" }
 hex = "0.4"
 ethabi = "16.0.0"
-itertools = "0.10.5"
+itertools = "0.10.5"
+log = "0.4.20"
+simplelog = "0.12.1"
+
+[dev-dependencies]
+httptest = "0.15.4"

README.md

@@ -55,6 +55,17 @@ Please note that `era-test-node` is still in its **alpha** stage. Some features
    ```bash
    era_test_node run
    ```
+## 📃 Logging
+
+The node may be started in either of `debug`, `info`, `warn` or `error` logging levels via the `--log` option:
+```bash
+era_test_node --log=error run
+```
+
+Additionally, the file path can be provided via the `--log-file-path` option (defaults to `./era_test_node.log`):
+```bash
+era_test_node --log=error --log-file-path=run.log run
+```
 
 ## 🌐 Network Details
 

SUPPORTED_APIS.md

@@ -31,8 +31,8 @@ The `status` options are:
 | `ETH` | `eth_feeHistory` | `NOT IMPLEMENTED` | Returns a collection of historical block gas data |
 | [`ETH`](#eth-namespace) | [`eth_gasPrice`](#eth_gasprice) | `SUPPORTED` | Returns the current price per gas in wei <br />_(hardcoded to `250_000_000`)_ |
 | [`ETH`](#eth-namespace) | [`eth_getBalance`](#eth_getbalance) | `SUPPORTED` | Returns the balance of the account of given address |
-| `ETH` | `eth_getBlockByHash` | `NOT IMPLEMENTED`<br />[GitHub Issue #25](https://github.com/matter-labs/era-test-node/issues/25) | Returns information about a block by block hash |
-| [`ETH`](#eth-namespace) | [`eth_getBlockByNumber`](#eth_getblockbynumber) | `PARTIALLY`<br />[GitHub Issue #71](https://github.com/matter-labs/era-test-node/issues/71) | Returns information about a block by block number<br /> ⚠️ _Support not available for `earliest`, `pending`, or block numbers other than the current block number_ |
+| [`ETH`](#eth-namespace) | `eth_getBlockByHash`(#eth_getblockbyhash) | `SUPPORTED` | Returns information about a block by block hash |
+| [`ETH`](#eth-namespace) | [`eth_getBlockByNumber`](#eth_getblockbynumber) | `SUPPORTED` | Returns information about a block by block number |
 | `ETH` | `eth_getBlockTransactionCountByHash` | `NOT IMPLEMENTED`<br />[GitHub Issue #44](https://github.com/matter-labs/era-test-node/issues/44) | Number of transactions in a block from a block matching the given block hash |
 | `ETH` | `eth_getBlockTransactionCountByNumber` | `NOT IMPLEMENTED`<br />[GitHub Issue #43](https://github.com/matter-labs/era-test-node/issues/43) | Number of transactions in a block from a block matching the given block number |
 | `ETH` | `eth_getCompilers` | `NOT IMPLEMENTED` | Returns a list of available compilers |
@@ -452,6 +452,36 @@ curl --request POST \
 }'
 ```
 
+### `eth_getBlockByHash`
+
+[source](src/node.rs)
+
+Returns information about a block by block hash
+
+#### Arguments
+
++ `hash: H256`
+
++ `full: boolean`
+
+#### Status
+
+`SUPPORTED`
+
+#### Example
+
+```bash
+curl --request POST \
+  --url http://localhost:8011/ \
+  --header 'content-type: application/json' \
+  --data '{
+    "jsonrpc": "2.0",
+    "id": "1",
+    "method": "eth_getBlockByHash",
+    "params": ["0x0000000000000000000000000000000000000000000000000000000000000008", false]
+}'
+```
+
 ### `eth_getBlockByNumber`
 
 [source](src/node.rs)
@@ -466,7 +496,7 @@ Returns information about a block by block number
 
 #### Status
 
-`PARTIALLY`
+`SUPPORTED`
 
 #### Example
 

src/console_log.rs

@@ -68,6 +68,6 @@ impl ConsoleLogHandler {
                         tokens.iter().map(|t| format!("{}", t)).join(" ")
                     })
                 });
-        println!("{}", message.cyan());
+        log::info!("{}", message.cyan());
     }
 }

src/fork.rs

@@ -14,7 +14,7 @@ use tokio::runtime::Builder;
 use zksync_basic_types::{Address, L1BatchNumber, L2ChainId, MiniblockNumber, H256, U256, U64};
 
 use zksync_types::{
-    api::{BlockIdVariant, BlockNumber, Transaction},
+    api::{Block, BlockIdVariant, BlockNumber, Transaction, TransactionVariant},
     l2::L2Tx,
     StorageKey,
 };
@@ -75,7 +75,7 @@ impl<S: ForkSource> ForkStorage<S> {
             .as_ref()
             .and_then(|d| d.overwrite_chain_id)
             .unwrap_or(L2ChainId(TEST_NODE_NETWORK_ID));
-        println!("Starting network with chain id: {:?}", chain_id);
+        log::info!("Starting network with chain id: {:?}", chain_id);
 
         ForkStorage {
             inner: Arc::new(RwLock::new(ForkStorageInner {
@@ -208,6 +208,20 @@ pub trait ForkSource {
         &self,
         block_number: MiniblockNumber,
     ) -> eyre::Result<Vec<zksync_types::Transaction>>;
+
+    /// Returns the block for a given hash.
+    fn get_block_by_hash(
+        &self,
+        hash: H256,
+        full_transactions: bool,
+    ) -> eyre::Result<Option<Block<TransactionVariant>>>;
+
+    /// Returns the block for a given number.
+    fn get_block_by_number(
+        &self,
+        block_number: zksync_types::api::BlockNumber,
+        full_transactions: bool,
+    ) -> eyre::Result<Option<zksync_types::api::Block<zksync_types::api::TransactionVariant>>>;
 }
 
 /// Holds the information about the original chain.
@@ -218,7 +232,10 @@ pub struct ForkDetails<S> {
     pub fork_source: S,
     // Block number at which we forked (the next block to create is l1_block + 1)
     pub l1_block: L1BatchNumber,
+    // The actual L2 block
+    pub l2_block: zksync_types::api::Block<zksync_types::api::TransactionVariant>,
     pub l2_miniblock: u64,
+    pub l2_miniblock_hash: H256,
     pub block_timestamp: u64,
     pub overwrite_chain_id: Option<L2ChainId>,
     pub l1_gas_price: u64,
@@ -237,9 +254,24 @@ impl ForkDetails<HttpForkSource> {
             .unwrap()
             .unwrap_or_else(|| panic!("Could not find block {:?} in {:?}", miniblock, url));
 
+        let root_hash = block_details
+            .base
+            .root_hash
+            .unwrap_or_else(|| panic!("fork block #{} missing root hash", miniblock));
+        let block = client
+            .get_block_by_hash(root_hash, true)
+            .await
+            .ok()
+            .flatten()
+            .unwrap_or_else(|| {
+                panic!(
+                    "Could not find block #{:?} ({:#x}) in {:?}",
+                    miniblock, root_hash, url
+                )
+            });
         let l1_batch_number = block_details.l1_batch_number;
 
-        println!(
+        log::info!(
             "Creating fork from {:?} L1 block: {:?} L2 block: {:?} with timestamp {:?} and L1 gas price {:?}",
             url, l1_batch_number, miniblock, block_details.base.timestamp, block_details.base.l1_gas_price,
         );
@@ -249,8 +281,10 @@ impl ForkDetails<HttpForkSource> {
                 fork_url: url.to_owned(),
             },
             l1_block: l1_batch_number,
+            l2_block: block,
             block_timestamp: block_details.base.timestamp,
             l2_miniblock: miniblock,
+            l2_miniblock_hash: root_hash,
             overwrite_chain_id: chain_id,
             l1_gas_price: block_details.base.l1_gas_price,
         }