Skip to content

fix compile error #319

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
MarvelFisher merged 1 commit into from
May 15, 2024
Merged

fix compile error #319

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ github.com/morph-l2/tendermint v0.1.0-beta.0.20240417065957-8ff3c98baa2f h1:xVTU
github.com/morph-l2/tendermint v0.1.0-beta.0.20240417065957-8ff3c98baa2f/go.mod h1:0d9/EvR8QheuLJBOq7mHPunn/7dPW22JGfeOaNEMxhA=
github.com/morph-l2/tendermint v0.2.0-beta h1:j/6DvfrKt5nT1ZG55Uh6sxzdrtlPgdMbEQ7uE4iZQzo=
github.com/morph-l2/tendermint v0.2.0-beta/go.mod h1:0d9/EvR8QheuLJBOq7mHPunn/7dPW22JGfeOaNEMxhA=
github.com/morph-l2/tendermint v0.2.0-beta.0.20240513090937-03bf2a578b48 h1:12smHBB/l1p8KLZ90ooRat++WwiIAjqEMw5MzbZPK4s=
github.com/morph-l2/tendermint v0.2.0-beta.0.20240513090937-03bf2a578b48/go.mod h1:0d9/EvR8QheuLJBOq7mHPunn/7dPW22JGfeOaNEMxhA=
github.com/mrunalp/fileutils v0.5.1 h1:F+S7ZlNKnrwHfSwdlgNSkKo67ReVf8o9fel6C3dkm/Q=
github.com/mrunalp/fileutils v0.5.1/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
Expand Down
21 changes: 10 additions & 11 deletions node/core/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,17 +282,16 @@ func (e *Executor) CommitBatch(currentBlockBytes []byte, currentTxs tmtypes.Txs,

currentIndex := e.batchingCache.parentBatchHeader.BatchIndex + 1
if err = e.l2Client.CommitBatch(context.Background(), &eth.RollupBatch{
Version: 0,
Index: currentIndex,
Hash: e.batchingCache.sealedBatchHeader.Hash(),
ParentBatchHeader: e.batchingCache.parentBatchHeader.Encode(),
CurrentSequencerSetBytes: sequencerBytes,
Chunks: chunksBytes,
SkippedL1MessageBitmap: e.batchingCache.sealedBatchHeader.SkippedL1MessageBitmap,
PrevStateRoot: e.batchingCache.prevStateRoot,
PostStateRoot: e.batchingCache.postStateRoot,
WithdrawRoot: e.batchingCache.withdrawRoot,
Sidecar: e.batchingCache.sealedSidecar,
Version: 0,
Index: currentIndex,
Hash: e.batchingCache.sealedBatchHeader.Hash(),
ParentBatchHeader: e.batchingCache.parentBatchHeader.Encode(),
Chunks: chunksBytes,
SkippedL1MessageBitmap: e.batchingCache.sealedBatchHeader.SkippedL1MessageBitmap,
PrevStateRoot: e.batchingCache.prevStateRoot,
PostStateRoot: e.batchingCache.postStateRoot,
WithdrawRoot: e.batchingCache.withdrawRoot,
Sidecar: e.batchingCache.sealedSidecar,
}, batchSigs); err != nil {
return err
}
Expand Down