diff --git a/proto/src/proto/executor/v1/executor.proto b/proto/src/proto/executor/v1/executor.proto index 791e1b7a3e..5e6719e1f9 100644 --- a/proto/src/proto/executor/v1/executor.proto +++ b/proto/src/proto/executor/v1/executor.proto @@ -702,7 +702,7 @@ enum ExecutorError { EXECUTOR_ERROR_SM_MAIN_HASHPDIGEST_ADDRESS_NOT_FOUND = 30; // EXECUTOR_ERROR_SM_MAIN_HASHPDIGEST_NOT_COMPLETED indicates that the hash has not been completed while calling a Poseidon hash digest EXECUTOR_ERROR_SM_MAIN_HASHPDIGEST_NOT_COMPLETED = 31; - // EXECUTOR_ERROR_SM_MAIN_MEMALIGN_OFFSET_OUT_OF_RANGE indicates that the an offset register value is out of range while doing a mem align operation + // EXECUTOR_ERROR_SM_MAIN_MEMALIGN_OFFSET_OUT_OF_RANGE indicates that an offset register value is out of range while doing a mem align operation EXECUTOR_ERROR_SM_MAIN_MEMALIGN_OFFSET_OUT_OF_RANGE = 32; // EXECUTOR_ERROR_SM_MAIN_MULTIPLE_FREEIN indicates that we got more than one free inputs in one ROM instruction EXECUTOR_ERROR_SM_MAIN_MULTIPLE_FREEIN = 33; diff --git a/state/runtime/executor/executor.pb.go b/state/runtime/executor/executor.pb.go index e89e9a4f32..68fc1cc3b4 100644 --- a/state/runtime/executor/executor.pb.go +++ b/state/runtime/executor/executor.pb.go @@ -267,7 +267,7 @@ const ( ExecutorError_EXECUTOR_ERROR_SM_MAIN_HASHPDIGEST_ADDRESS_NOT_FOUND ExecutorError = 30 // EXECUTOR_ERROR_SM_MAIN_HASHPDIGEST_NOT_COMPLETED indicates that the hash has not been completed while calling a Poseidon hash digest ExecutorError_EXECUTOR_ERROR_SM_MAIN_HASHPDIGEST_NOT_COMPLETED ExecutorError = 31 - // EXECUTOR_ERROR_SM_MAIN_MEMALIGN_OFFSET_OUT_OF_RANGE indicates that the an offset register value is out of range while doing a mem align operation + // EXECUTOR_ERROR_SM_MAIN_MEMALIGN_OFFSET_OUT_OF_RANGE indicates that an offset register value is out of range while doing a mem align operation ExecutorError_EXECUTOR_ERROR_SM_MAIN_MEMALIGN_OFFSET_OUT_OF_RANGE ExecutorError = 32 // EXECUTOR_ERROR_SM_MAIN_MULTIPLE_FREEIN indicates that we got more than one free inputs in one ROM instruction ExecutorError_EXECUTOR_ERROR_SM_MAIN_MULTIPLE_FREEIN ExecutorError = 33 diff --git a/state/runtime/runtime.go b/state/runtime/runtime.go index 2e1b9a744d..e81f179cb1 100644 --- a/state/runtime/runtime.go +++ b/state/runtime/runtime.go @@ -146,7 +146,7 @@ var ( ErrExecutorSMMainHashPDigestAddressNotFound = errors.New("address has not been found while calculating a Poseidon hash digest") // ErrExecutorSMMainHashPDigestNotCompleted indicates that the hash has not been completed while calling a Poseidon hash digest ErrExecutorSMMainHashPDigestNotCompleted = errors.New("hash has not been completed while calling a Poseidon hash digest") - // ErrExecutorSMMainMemAlignOffsetOutOfRange indicates that the an offset register value is out of range while doing a mem align operation + // ErrExecutorSMMainMemAlignOffsetOutOfRange indicates that an offset register value is out of range while doing a mem align operation ErrExecutorSMMainMemAlignOffsetOutOfRange = errors.New("offset register value is out of range while doing a mem align operation") // ErrExecutorSMMainMultipleFreeIn indicates that we got more than one free inputs in one ROM instruction ErrExecutorSMMainMultipleFreeIn = errors.New("more than one free inputs in one ROM instruction") diff --git a/synchronizer/l1_parallel_sync/l1_rollup_info_consumer_statistics.go b/synchronizer/l1_parallel_sync/l1_rollup_info_consumer_statistics.go index c4c70c573e..366b05334c 100644 --- a/synchronizer/l1_parallel_sync/l1_rollup_info_consumer_statistics.go +++ b/synchronizer/l1_parallel_sync/l1_rollup_info_consumer_statistics.go @@ -35,7 +35,7 @@ func (l *l1RollupInfoConsumerStatistics) onReset() { func (l *l1RollupInfoConsumerStatistics) onStartProcessIncommingRollupInfoData(rollupInfo rollupInfoByBlockRangeResult) string { now := time.Now() - // Time have have been blocked in the select statement + // Time have been blocked in the select statement waitingTimeForData := now.Sub(l.startStepTime) blocksPerSecond := float64(l.numProcessedBlocks) / time.Since(l.startTime).Seconds() generatedWarning := false diff --git a/synchronizer/l2_sync/l2_shared/tests/processor_trusted_batch_sync_test.go b/synchronizer/l2_sync/l2_shared/tests/processor_trusted_batch_sync_test.go index 79e62c93d5..7e521e3c29 100644 --- a/synchronizer/l2_sync/l2_shared/tests/processor_trusted_batch_sync_test.go +++ b/synchronizer/l2_sync/l2_shared/tests/processor_trusted_batch_sync_test.go @@ -164,7 +164,7 @@ func TestGetModeForProcessBatchReprocessMode(t *testing.T) { testData.stateCurrentBatch.StateRoot = state.ZeroHash processData, err := testData.sut.GetModeForProcessBatch(testData.trustedNodeBatch, testData.stateCurrentBatch, testData.statePreviousBatch, "test") require.NoError(t, err) - require.Equal(t, l2_shared.ReprocessProcessMode, processData.Mode, "local batch doesnt have stateRoot but exists, so so it needs to be reprocess") + require.Equal(t, l2_shared.ReprocessProcessMode, processData.Mode, "local batch doesnt have stateRoot but exists, so it needs to be reprocess") require.Equal(t, true, processData.BatchMustBeClosed, "the trustedNode batch is closed") require.Equal(t, testData.statePreviousBatch.StateRoot, processData.OldStateRoot, "the old state root is the previous batch SR") } diff --git a/synchronizer/l2_sync/l2_sync_etrog/check_sync_status_to_process_batch.go b/synchronizer/l2_sync/l2_sync_etrog/check_sync_status_to_process_batch.go index 019c487231..2ebecbd9a3 100644 --- a/synchronizer/l2_sync/l2_sync_etrog/check_sync_status_to_process_batch.go +++ b/synchronizer/l2_sync/l2_sync_etrog/check_sync_status_to_process_batch.go @@ -36,7 +36,7 @@ func NewCheckSyncStatusToProcessBatch(zkevmRPCClient syncinterfaces.ZKEVMClientG // CheckL1SyncGlobalExitRootEnoughToProcessBatch returns nil if the are sync and could process the batch // if not: // - returns syncinterfaces.ErrMissingSyncFromL1 if we are behind the block number that contains the GlobalExitRoot -// - returns l2_shared.NewDeSyncPermissionlessAndTrustedNodeError if trusted and and permissionless are not in same page! pass also the discrepance point +// - returns l2_shared.NewDeSyncPermissionlessAndTrustedNodeError if trusted and permissionless are not in same page! pass also the discrepancy point func (c *CheckSyncStatusToProcessBatch) CheckL1SyncGlobalExitRootEnoughToProcessBatch(ctx context.Context, batchNumber uint64, globalExitRoot common.Hash, dbTx pgx.Tx) error { // Find out if this node have GlobalExitRoot // If not: ask to zkevm-RPC the block number of this GlobalExitRoot