Skip to content

Commit e6af5b6

Browse files
authored
Merge branch 'jt/l1-follower-mode-update-da-codec' into jt/permissionless-batches-recovery-rebased
2 parents 8ba140c + 3c21f4e commit e6af5b6

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

params/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
const (
2525
VersionMajor = 5 // Major version component of the current release
2626
VersionMinor = 8 // Minor version component of the current release
27-
VersionPatch = 5 // Patch version component of the current release
27+
VersionPatch = 6 // Patch version component of the current release
2828
VersionMeta = "mainnet" // Version metadata to append to the version string
2929
)
3030

rollup/da_syncer/da/calldata_blob_source.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func (ds *CalldataBlobSource) getCommitBatchDA(commitEvents []*l1.CommitBatchEve
243243
if entry, err = NewCommitBatchDAV1(ds.ctx, ds.db, ds.blobClient, codec, commitEvent, args.ParentBatchHeader, args.Chunks, args.SkippedL1MessageBitmap, args.BlobHashes, blockHeader.Time); err != nil {
244244
return nil, fmt.Errorf("failed to decode DA, batch index: %d, err: %w", commitEvent.BatchIndex().Uint64(), err)
245245
}
246-
case 7:
246+
default: // CodecVersion 7 and above
247247
if i >= len(args.BlobHashes) {
248248
return nil, fmt.Errorf("not enough blob hashes for commit transaction: %s, index in tx: %d, batch index: %d, hash: %s", firstCommitEvent.TxHash(), i, commitEvent.BatchIndex().Uint64(), commitEvent.BatchHash().Hex())
249249
}
@@ -259,8 +259,6 @@ func (ds *CalldataBlobSource) getCommitBatchDA(commitEvents []*l1.CommitBatchEve
259259
if entry, err = NewCommitBatchDAV7(ds.ctx, ds.db, ds.blobClient, codec, commitEvent, blobHash, parentBatchHash, blockHeader.Time); err != nil {
260260
return nil, fmt.Errorf("failed to decode DA, batch index: %d, err: %w", commitEvent.BatchIndex().Uint64(), err)
261261
}
262-
default:
263-
return nil, fmt.Errorf("failed to decode DA, codec version is unknown: codec version: %d", args.Version)
264262
}
265263

266264
previousEvent = commitEvent

0 commit comments

Comments
 (0)