From 0ba10596ce70e9ab4bd67e4acc9d220dd3b12cb5 Mon Sep 17 00:00:00 2001 From: Karl Floersch Date: Mon, 1 Feb 2021 16:28:12 -0800 Subject: [PATCH 1/2] Fix three terribly named variables --- src/batch-submitter/tx-batch-submitter.ts | 8 ++++---- src/transaciton-chain-contract.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/batch-submitter/tx-batch-submitter.ts b/src/batch-submitter/tx-batch-submitter.ts index 636774d..44a03fa 100644 --- a/src/batch-submitter/tx-batch-submitter.ts +++ b/src/batch-submitter/tx-batch-submitter.ts @@ -16,7 +16,7 @@ import { CanonicalTransactionChainContract, encodeAppendSequencerBatch, BatchContext, - AppendSequencerBatchParams, + SequencerTransactionBatch, } from '../transaciton-chain-contract' import { EIP155TxData, @@ -206,7 +206,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter { private async _generateSequencerBatchParams( startBlock: number, endBlock: number - ): Promise<[AppendSequencerBatchParams, boolean]> { + ): Promise<[SequencerTransactionBatch, boolean]> { // Get all L2 BatchElements for the given range // For now we need to update our internal `lastL1BlockNumber` value // which is used when submitting batches. @@ -240,7 +240,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter { private async _getSequencerBatchParams( shouldStartAtIndex: number, blocks: Batch - ): Promise { + ): Promise { const totalElementsToAppend = blocks.length // Generate contexts @@ -316,7 +316,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter { return { // TODO: Remove BLOCK_OFFSET by adding a tx to Geth's genesis - shouldStartAtBatch: shouldStartAtIndex - BLOCK_OFFSET, + shouldStartAtElement: shouldStartAtIndex - BLOCK_OFFSET, totalElementsToAppend, contexts, transactions, diff --git a/src/transaciton-chain-contract.ts b/src/transaciton-chain-contract.ts index 9c5106d..31a15f2 100644 --- a/src/transaciton-chain-contract.ts +++ b/src/transaciton-chain-contract.ts @@ -11,8 +11,8 @@ export interface BatchContext { blockNumber: number } -export interface AppendSequencerBatchParams { - shouldStartAtBatch: number // 5 bytes -- starts at batch +export interface SequencerTransactionBatch { + shouldStartAtElement: number // 5 bytes -- starts at batch totalElementsToAppend: number // 3 bytes -- total_elements_to_append contexts: BatchContext[] // total_elements[fixed_size[]] transactions: string[] // total_size_bytes[],total_size_bytes[] @@ -24,7 +24,7 @@ export interface AppendSequencerBatchParams { */ export class CanonicalTransactionChainContract extends Contract { public async appendSequencerBatch( - batch: AppendSequencerBatchParams + batch: SequencerTransactionBatch ): Promise { return appendSequencerBatch(this, batch) } @@ -38,7 +38,7 @@ const APPEND_SEQUENCER_BATCH_METHOD_ID = 'appendSequencerBatch()' const appendSequencerBatch = async ( OVM_CanonicalTransactionChain: Contract, - batch: AppendSequencerBatchParams + batch: SequencerTransactionBatch ): Promise => { const methodId = keccak256( Buffer.from(APPEND_SEQUENCER_BATCH_METHOD_ID) @@ -51,9 +51,9 @@ const appendSequencerBatch = async ( } export const encodeAppendSequencerBatch = ( - b: AppendSequencerBatchParams + b: SequencerTransactionBatch ): string => { - const encodedShouldStartAtBatch = encodeHex(b.shouldStartAtBatch, 10) + const encodedShouldStartAtElement = encodeHex(b.shouldStartAtElement, 10) const encodedTotalElementsToAppend = encodeHex(b.totalElementsToAppend, 6) const encodedContextsHeader = encodeHex(b.contexts.length, 6) @@ -71,7 +71,7 @@ export const encodeAppendSequencerBatch = ( return acc + encodedTxDataHeader + remove0x(cur) }, '') return ( - encodedShouldStartAtBatch + + encodedShouldStartAtElement + encodedTotalElementsToAppend + encodedContexts + encodedTransactionData From bdd25e61c3ab9b10ad34e14f2e97382f3e66184f Mon Sep 17 00:00:00 2001 From: Karl Floersch Date: Mon, 1 Feb 2021 16:50:02 -0800 Subject: [PATCH 2/2] Revert back to AppendSequencerBatchParams --- src/batch-submitter/tx-batch-submitter.ts | 6 +++--- src/transaciton-chain-contract.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/batch-submitter/tx-batch-submitter.ts b/src/batch-submitter/tx-batch-submitter.ts index 44a03fa..629666e 100644 --- a/src/batch-submitter/tx-batch-submitter.ts +++ b/src/batch-submitter/tx-batch-submitter.ts @@ -16,7 +16,7 @@ import { CanonicalTransactionChainContract, encodeAppendSequencerBatch, BatchContext, - SequencerTransactionBatch, + AppendSequencerBatchParams, } from '../transaciton-chain-contract' import { EIP155TxData, @@ -206,7 +206,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter { private async _generateSequencerBatchParams( startBlock: number, endBlock: number - ): Promise<[SequencerTransactionBatch, boolean]> { + ): Promise<[AppendSequencerBatchParams, boolean]> { // Get all L2 BatchElements for the given range // For now we need to update our internal `lastL1BlockNumber` value // which is used when submitting batches. @@ -240,7 +240,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter { private async _getSequencerBatchParams( shouldStartAtIndex: number, blocks: Batch - ): Promise { + ): Promise { const totalElementsToAppend = blocks.length // Generate contexts diff --git a/src/transaciton-chain-contract.ts b/src/transaciton-chain-contract.ts index 31a15f2..4a974a9 100644 --- a/src/transaciton-chain-contract.ts +++ b/src/transaciton-chain-contract.ts @@ -11,7 +11,7 @@ export interface BatchContext { blockNumber: number } -export interface SequencerTransactionBatch { +export interface AppendSequencerBatchParams { shouldStartAtElement: number // 5 bytes -- starts at batch totalElementsToAppend: number // 3 bytes -- total_elements_to_append contexts: BatchContext[] // total_elements[fixed_size[]] @@ -24,7 +24,7 @@ export interface SequencerTransactionBatch { */ export class CanonicalTransactionChainContract extends Contract { public async appendSequencerBatch( - batch: SequencerTransactionBatch + batch: AppendSequencerBatchParams ): Promise { return appendSequencerBatch(this, batch) } @@ -38,7 +38,7 @@ const APPEND_SEQUENCER_BATCH_METHOD_ID = 'appendSequencerBatch()' const appendSequencerBatch = async ( OVM_CanonicalTransactionChain: Contract, - batch: SequencerTransactionBatch + batch: AppendSequencerBatchParams ): Promise => { const methodId = keccak256( Buffer.from(APPEND_SEQUENCER_BATCH_METHOD_ID) @@ -51,7 +51,7 @@ const appendSequencerBatch = async ( } export const encodeAppendSequencerBatch = ( - b: SequencerTransactionBatch + b: AppendSequencerBatchParams ): string => { const encodedShouldStartAtElement = encodeHex(b.shouldStartAtElement, 10) const encodedTotalElementsToAppend = encodeHex(b.totalElementsToAppend, 6)