Skip to content
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

Jump to bottom

Feature/#1506 forced batch #1523

Merged
merged 7 commits into from
Jan 11, 2023
Merged

Feature/#1506 forced batch #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c61f975
ForceBatch unit test
ARR552 Jan 9, 2023
0ad8206
SequenceForceBatch unit test
ARR552 Jan 9, 2023
4d5bcb7
Fix forcedBatch check
ARR552 Jan 9, 2023
c5b58c5
linter
ARR552 Jan 9, 2023
84b5969
Fix reset forcedBatch
ARR552 Jan 10, 2023
6687e3a
batch and forcedbatch table modified
ARR552 Jan 11, 2023
ecd24da
fix
ARR552 Jan 11, 2023
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
15 changes: 15 additions & 0 deletions db/migrations/state/0003.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- +migrate Up
ALTER TABLE state.forced_batch
DROP COLUMN IF EXISTS batch_num;

ALTER TABLE state.batch
ADD COLUMN forced_batch_num BIGINT;
ALTER TABLE state.batch
ADD FOREIGN KEY (forced_batch_num) REFERENCES state.forced_batch(forced_batch_num);

-- +migrate Down
ALTER TABLE state.batch
DROP COLUMN IF EXISTS forced_batch_num;

ALTER TABLE state.forced_batch
ADD COLUMN batch_num BIGINT;
1 change: 0 additions & 1 deletion sequencer/broadcast/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ type stateInterface interface {
GetLastBatch(ctx context.Context, dbTx pgx.Tx) (*state.Batch, error)
GetBatchByNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (*state.Batch, error)
GetEncodedTransactionsByBatchNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (encoded []string, err error)
GetForcedBatchByBatchNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (*state.ForcedBatch, error)
GetExitRootByGlobalExitRoot(ctx context.Context, ger common.Hash, dbTx pgx.Tx) (*state.GlobalExitRoot, error)
}
25 changes: 1 addition & 24 deletions sequencer/broadcast/mocks/mock_state.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 5 additions & 9 deletions sequencer/broadcast/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,6 @@ func (s *Server) genericGetBatch(ctx context.Context, batch *state.Batch) (*pb.G
}
}

var forcedBatchNum uint64
forcedBatch, err := s.state.GetForcedBatchByBatchNumber(ctx, batch.BatchNumber, nil)
if err == nil {
forcedBatchNum = forcedBatch.ForcedBatchNumber
} else if err != state.ErrNotFound {
return nil, err
}

var mainnetExitRoot, rollupExitRoot string
ger, err := s.state.GetExitRootByGlobalExitRoot(ctx, batch.GlobalExitRoot, nil)
if err == nil {
Expand All @@ -108,6 +100,10 @@ func (s *Server) genericGetBatch(ctx context.Context, batch *state.Batch) (*pb.G
} else if err != state.ErrNotFound {
return nil, err
}
var fb uint64
if batch.ForcedBatchNum != nil {
fb = *batch.ForcedBatchNum
}

return &pb.GetBatchResponse{
BatchNumber: batch.BatchNumber,
Expand All @@ -119,7 +115,7 @@ func (s *Server) genericGetBatch(ctx context.Context, batch *state.Batch) (*pb.G
RollupExitRoot: rollupExitRoot,
Timestamp: uint64(batch.Timestamp.Unix()),
Transactions: transactions,
ForcedBatchNumber: forcedBatchNum,
ForcedBatchNumber: fb,
arnaubennassar marked this conversation as resolved.
Show resolved Hide resolved
}, nil
}

Expand Down
2 changes: 0 additions & 2 deletions sequencer/broadcast/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ func TestBroadcastServerGetBatch(t *testing.T) {
}
st.On("GetBatchByNumber", mock.AnythingOfType("*context.valueCtx"), tc.inputBatchNumber, nil).Return(tc.expectedBatch, err)
st.On("GetEncodedTransactionsByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.inputBatchNumber, nil).Return(tc.expectedEncodedTxs, err)
st.On("GetForcedBatchByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.inputBatchNumber, nil).Return(tc.expectedForcedBatch, err)
if tc.expectedBatch != nil {
st.On("GetExitRootByGlobalExitRoot", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.GlobalExitRoot, nil).Return(tc.expectedGER, err)
}
Expand Down Expand Up @@ -217,7 +216,6 @@ func TestBroadcastServerGetLastBatch(t *testing.T) {
st.On("GetLastBatch", mock.AnythingOfType("*context.valueCtx"), nil).Return(tc.expectedBatch, err)
if tc.expectedBatch != nil {
st.On("GetEncodedTransactionsByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.BatchNumber, nil).Return(tc.expectedEncodedTxs, err)
st.On("GetForcedBatchByBatchNumber", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.BatchNumber, nil).Return(tc.expectedForcedBatch, err)
st.On("GetExitRootByGlobalExitRoot", mock.AnythingOfType("*context.valueCtx"), tc.expectedBatch.GlobalExitRoot, nil).Return(tc.expectedGER, err)
}

Expand Down
2 changes: 2 additions & 0 deletions state/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type Batch struct {
Timestamp time.Time
Transactions []types.Transaction
GlobalExitRoot common.Hash
ForcedBatchNum *uint64
}

// ProcessingContext is the necessary data that a batch needs to provide to the runtime,
Expand All @@ -27,6 +28,7 @@ type ProcessingContext struct {
Coinbase common.Address
Timestamp time.Time
GlobalExitRoot common.Hash
ForcedBatchNum *uint64
}

// ProcessingReceipt indicates the outcome (StateRoot, AccInputHash) of processing a batch
Expand Down
1 change: 0 additions & 1 deletion state/forcedbatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
// ForcedBatch represents a ForcedBatch
type ForcedBatch struct {
BlockNumber uint64
BatchNumber *uint64
ForcedBatchNumber uint64
Sequencer common.Address
GlobalExitRoot common.Hash
Expand Down
Loading