Merge pull request #761 from matter-labs/dvush/seal-withdraw-block-fa…

…ster

Dvush/seal withdraw block faster

core/models/src/config_options.rs

@@ -130,6 +130,8 @@ pub struct ConfigurationOptions {
     pub idle_provers: u32,
     /// Max number of miniblocks (produced every period of `TX_MINIBATCH_CREATE_TIME`) if one block.
     pub max_miniblock_iterations: usize,
+    /// Max number of miniblocks for block with withdraw operations (defaults to `max_minblock_iterations`).
+    pub max_miniblock_iterations_withdraw_block: usize,
 }
 
 impl ConfigurationOptions {
@@ -138,6 +140,14 @@ impl ConfigurationOptions {
     pub fn from_env() -> Self {
         let mut available_block_chunk_sizes = block_chunk_sizes().to_vec();
         available_block_chunk_sizes.sort();
+
+        let max_miniblock_iterations_withdraw_block =
+            if env::var("WITHDRAW_BLOCK_MINIBLOCKS_ITERATIONS").is_ok() {
+                parse_env("WITHDRAW_BLOCK_MINIBLOCKS_ITERATIONS")
+            } else {
+                parse_env("MINIBLOCKS_ITERATIONS")
+            };
+
         Self {
             rest_api_server_address: parse_env("REST_API_BIND"),
             json_rpc_http_server_address: parse_env("HTTP_RPC_API_BIND"),
@@ -166,6 +176,7 @@ impl ConfigurationOptions {
             ticker_url: parse_env("TICKER_URL"),
             idle_provers: parse_env("IDLE_PROVERS"),
             max_miniblock_iterations: parse_env("MINIBLOCKS_ITERATIONS"),
+            max_miniblock_iterations_withdraw_block,
         }
     }
 }

core/server/src/main.rs

@@ -164,6 +164,7 @@ fn main() {
         executed_tx_notify_sender,
         config_opts.available_block_chunk_sizes.clone(),
         config_opts.max_miniblock_iterations,
+        config_opts.max_miniblock_iterations_withdraw_block,
     );
     let state_keeper_task = start_state_keeper(state_keeper, pending_block, &main_runtime);
 

core/server/src/state_keeper.rs

@@ -95,6 +95,7 @@ pub struct PlasmaStateKeeper {
 
     available_block_chunk_sizes: Vec<usize>,
     max_miniblock_iterations: usize,
+    max_miniblock_iterations_withdraw_block: usize,
 }
 
 pub struct PlasmaStateInitParams {
@@ -232,6 +233,7 @@ impl PlasmaStateInitParams {
 }
 
 impl PlasmaStateKeeper {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         initial_state: PlasmaStateInitParams,
         fee_account_address: Address,
@@ -240,6 +242,7 @@ impl PlasmaStateKeeper {
         executed_tx_notify_sender: mpsc::Sender<ExecutedOpsNotify>,
         available_block_chunk_sizes: Vec<usize>,
         max_miniblock_iterations: usize,
+        max_miniblock_iterations_withdraw_block: usize,
     ) -> Self {
         assert!(!available_block_chunk_sizes.is_empty());
 
@@ -271,6 +274,7 @@ impl PlasmaStateKeeper {
             executed_tx_notify_sender,
             available_block_chunk_sizes,
             max_miniblock_iterations,
+            max_miniblock_iterations_withdraw_block,
         };
 
         let root = keeper.state.root_hash();
@@ -471,7 +475,14 @@ impl PlasmaStateKeeper {
 
         if !self.pending_block.success_operations.is_empty() {
             self.pending_block.pending_block_iteration += 1;
-            if self.pending_block.pending_block_iteration > self.max_miniblock_iterations {
+
+            // If pending block contains withdrawals we seal it faster
+            let max_miniblock_iterations = if self.pending_block.withdrawals_amount > 0 {
+                self.max_miniblock_iterations_withdraw_block
+            } else {
+                self.max_miniblock_iterations
+            };
+            if self.pending_block.pending_block_iteration > max_miniblock_iterations {
                 self.seal_pending_block().await;
                 self.notify_executed_ops(&mut executed_ops).await;
                 return;

core/testkit/src/lib.rs

@@ -347,6 +347,7 @@ pub fn spawn_state_keeper(
         executed_tx_notify_sender,
         block_chunks_sizes,
         max_miniblock_iterations,
+        max_miniblock_iterations,
     );
 
     let (stop_state_keeper_sender, stop_state_keeper_receiver) = oneshot::channel::<()>();

etc/env/dev.env.example

@@ -137,3 +137,5 @@ ETH_WATCH_POLL_INTERVAL=300
 
 # Determines block formation time
 MINIBLOCKS_ITERATIONS=50
+# Determines block formation time if block contains withdrawals
+WITHDRAW_BLOCK_MINIBLOCKS_ITERATIONS=20