Merge pull request #1346 from ethereum-optimism/fix/remove-append-queuebatch

batch-submitter: remove call to `appendQueueBatch`

.changeset/olive-coins-run.md

+---
+'@eth-optimism/batch-submitter': patch
+---
+
+Removes the call to `appendQueueBatch` from the batch submitter

packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts

@@ -34,7 +34,6 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
   protected chainContract: CanonicalTransactionChainContract
   protected l2ChainId: number
   protected syncing: boolean
-  private disableQueueBatchAppend: boolean
   private autoFixBatchOptions: AutoFixBatchOptions
   private transactionSubmitter: TransactionSubmitter
   private gasThresholdInGwei: number
@@ -55,7 +54,6 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
     blockOffset: number,
     logger: Logger,
     metrics: Metrics,
-    disableQueueBatchAppend: boolean,
     autoFixBatchOptions: AutoFixBatchOptions = {
       fixDoublePlayedDeposits: false,
       fixMonotonicity: false,
@@ -78,7 +76,6 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
       logger,
       metrics
     )
-    this.disableQueueBatchAppend = disableQueueBatchAppend
     this.autoFixBatchOptions = autoFixBatchOptions
     this.gasThresholdInGwei = gasThresholdInGwei
     this.transactionSubmitter = transactionSubmitter
@@ -137,11 +134,8 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
         'Syncing mode enabled! Skipping batch submission and clearing queue elements',
         { pendingQueueElements }
       )
-
-      if (!this.disableQueueBatchAppend) {
-        return this.submitAppendQueueBatch()
-      }
     }
+
     this.logger.info('Syncing mode enabled but queue is empty. Skipping...')
     return
   }
@@ -229,20 +223,6 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
    * Private Functions *
    ********************/
 
-  private async submitAppendQueueBatch(): Promise<TransactionReceipt> {
-    const tx = await this.chainContract.populateTransaction.appendQueueBatch(
-      ethers.constants.MaxUint256 // Completely empty the queue by appending (up to) an enormous number of queue elements.
-    )
-    const submitTransaction = (): Promise<TransactionReceipt> => {
-      return this.transactionSubmitter.submitTransaction(
-        tx,
-        this._makeHooks('appendQueueBatch')
-      )
-    }
-    // Empty the queue with a huge `appendQueueBatch(..)` call
-    return this._submitAndLogTx(submitTransaction, 'Cleared queue!')
-  }
-
   private async submitAppendSequencerBatch(
     batchParams: AppendSequencerBatchParams
   ): Promise<TransactionReceipt> {

packages/batch-submitter/src/exec/run-batch-submitter.ts

@@ -64,7 +64,6 @@ interface RequiredEnvVars {
 
 /* Optional Env Vars
  * FRAUD_SUBMISSION_ADDRESS
- * DISABLE_QUEUE_BATCH_APPEND
  * SEQUENCER_PRIVATE_KEY
  * PROPOSER_PRIVATE_KEY
  * MNEMONIC
@@ -201,10 +200,6 @@ export const run = async () => {
     'fraud-submisison-address',
     env.FRAUD_SUBMISSION_ADDRESS || 'no fraud'
   )
-  const DISABLE_QUEUE_BATCH_APPEND = config.bool(
-    'disable-queue-batch-append',
-    !!env.DISABLE_QUEUE_BATCH_APPEND
-  )
   const MIN_GAS_PRICE_IN_GWEI = config.uint(
     'min-gas-price-in-gwei',
     parseInt(env.MIN_GAS_PRICE_IN_GWEI, 10) || 0
@@ -389,7 +384,6 @@ export const run = async () => {
     BLOCK_OFFSET,
     logger.child({ name: TX_BATCH_SUBMITTER_LOG_TAG }),
     metrics,
-    DISABLE_QUEUE_BATCH_APPEND,
     autoFixBatchOptions
   )
 

packages/batch-submitter/test/batch-submitter/batch-submitter.spec.ts

@@ -230,7 +230,6 @@ describe('BatchSubmitter', () => {
       1,
       new Logger({ name: TX_BATCH_SUBMITTER_LOG_TAG }),
       testMetrics,
-      false
     )
   }