fix(collator): use lt from Account for groups

broxus · Jun 14, 2024 · 308d747 · 308d747
1 parent 76dafeb
commit 308d747
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/collator/src/collator/execution_manager.rs b/collator/src/collator/execution_manager.rs
@@ -141,17 +141,16 @@ impl ExecutionManager {
 
                 let executor_output = tx.result?;
 
+                self.min_next_lt =
+                    cmp::max(self.min_next_lt, executor_output.account_last_trans_lt);
+
                 items.push(ExecutedTickItem {
                     account_addr: executed.account_state.account_addr,
                     in_message: tx.in_message,
                     executor_output,
                 });
             }
 
-            self.min_next_lt = cmp::max(
-                self.min_next_lt,
-                executed.account_state.shard_account.last_trans_lt + 1,
-            );
             self.accounts_cache
                 .add_account_stuff(executed.account_state);
         }
@@ -216,7 +215,9 @@ impl ExecutionManager {
         })
         .await?;
 
-        self.min_next_lt = cmp::max(min_next_lt, account_stuff.shard_account.last_trans_lt + 1);
+        if let Ok(executor_output) = &executed.result {
+            self.min_next_lt = cmp::max(min_next_lt, executor_output.account_last_trans_lt);
+        }
         self.accounts_cache.add_account_stuff(account_stuff);
         Ok(executed)
     }
@@ -245,7 +246,7 @@ impl ExecutionManager {
         })
         .await?;
 
-        self.min_next_lt = cmp::max(min_next_lt, account_stuff.shard_account.last_trans_lt + 1);
+        self.min_next_lt = cmp::max(min_next_lt, executed.account_last_trans_lt);
         self.accounts_cache.add_account_stuff(account_stuff);
         Ok(executed)
     }