Skip to content

Move l1BlockNum update into sequencer batch append #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karlfloersch merged 1 commit into from
Nov 16, 2020
Merged

Move l1BlockNum update into sequencer batch append #362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ export class TransactionBatchSubmitter extends BatchSubmitter {

public async _onSync(): Promise<TransactionReceipt> {
const pendingQueueElements = await this.chainContract.getNumPendingQueueElements()
this._updateLastL1BlockNumber(pendingQueueElements)

if (pendingQueueElements !== 0) {
this.log.info(
Expand All @@ -95,7 +94,9 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
}

// TODO: Remove this function and use geth for lastL1BlockNumber!
private async _updateLastL1BlockNumber(pendingQueueElements: number) {
private async _updateLastL1BlockNumber() {
const pendingQueueElements = await this.chainContract.getNumPendingQueueElements()

if (pendingQueueElements !== 0) {
const nextQueueIndex = await this.chainContract.getNextQueueIndex()
this.lastL1BlockNumber = await this.chainContract.getQueueElement(
Expand Down Expand Up @@ -163,6 +164,9 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
endBlock: number
): Promise<AppendSequencerBatchParams> {
// Get all L2 BatchElements for the given range
// For now we need to update our internal `lastL1BlockNumber` value
// which is used when submitting batches.
this._updateLastL1BlockNumber() // TODO: Remove this
const batch: Batch = []
for (let i = startBlock; i < endBlock; i++) {
batch.push(await this._getL2BatchElement(i))
Expand Down