Skip to content

Commit dd04178

Browse files
authored
fix: pending data wrappers pending block missing block_number (#2977)
pending data wrappers: add block number to pending block
1 parent a195448 commit dd04178

File tree

7 files changed

+8
-1
lines changed

7 files changed

+8
-1
lines changed

rpc/v6/pending_data_wrapper.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func emptyPendingForParent(parentHeader *core.Header) sync.Pending {
4242
pendingBlock := &core.Block{
4343
Header: &core.Header{
4444
ParentHash: parentHeader.Hash,
45+
Number: parentHeader.Number + 1,
4546
SequencerAddress: parentHeader.SequencerAddress,
4647
Timestamp: uint64(time.Now().Unix()),
4748
ProtocolVersion: parentHeader.ProtocolVersion,

rpc/v6/pending_data_wrapper_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ func TestPendingDataWrapper(t *testing.T) {
5959
expectedPendingB := &core.Block{
6060
Header: &core.Header{
6161
ParentHash: latestBlock.Hash,
62+
Number: latestBlockNumber + 1,
6263
SequencerAddress: latestBlock.SequencerAddress,
6364
Timestamp: uint64(time.Now().Unix()),
6465
ProtocolVersion: latestBlock.ProtocolVersion,

rpc/v7/pending_data_wrapper.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func emptyPendingForParent(parentHeader *core.Header) sync.Pending {
4242
pendingBlock := &core.Block{
4343
Header: &core.Header{
4444
ParentHash: parentHeader.Hash,
45+
Number: parentHeader.Number + 1,
4546
SequencerAddress: parentHeader.SequencerAddress,
4647
Timestamp: uint64(time.Now().Unix()),
4748
ProtocolVersion: parentHeader.ProtocolVersion,

rpc/v7/pending_data_wrapper_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func TestPendingDataWrapper(t *testing.T) {
6060
expectedPendingB := &core.Block{
6161
Header: &core.Header{
6262
ParentHash: latestBlock.Hash,
63+
Number: latestBlockNumber + 1,
6364
SequencerAddress: latestBlock.SequencerAddress,
6465
Timestamp: uint64(time.Now().Unix()),
6566
ProtocolVersion: latestBlock.ProtocolVersion,

rpc/v8/pending_data_wrapper.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func emptyPendingForParent(parentHeader *core.Header) sync.Pending {
4242
pendingBlock := &core.Block{
4343
Header: &core.Header{
4444
ParentHash: parentHeader.Hash,
45+
Number: parentHeader.Number + 1,
4546
SequencerAddress: parentHeader.SequencerAddress,
4647
Timestamp: uint64(time.Now().Unix()),
4748
ProtocolVersion: parentHeader.ProtocolVersion,

rpc/v8/pending_data_wrapper_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func TestPendingDataWrapper(t *testing.T) {
6060
expectedPendingB := &core.Block{
6161
Header: &core.Header{
6262
ParentHash: latestBlock.Hash,
63+
Number: latestBlockNumber + 1,
6364
SequencerAddress: latestBlock.SequencerAddress,
6465
Timestamp: uint64(time.Now().Unix()),
6566
ProtocolVersion: latestBlock.ProtocolVersion,

rpc/v9/pending_data_wrapper.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ func emptyPendingForParent(parentHeader *core.Header) sync.Pending {
6969
pendingBlock := &core.Block{
7070
Header: &core.Header{
7171
ParentHash: parentHeader.Hash,
72+
Number: parentHeader.Number + 1,
7273
SequencerAddress: parentHeader.SequencerAddress,
7374
Timestamp: uint64(time.Now().Unix()),
7475
ProtocolVersion: parentHeader.ProtocolVersion,
@@ -107,8 +108,8 @@ func emptyPreConfirmedForParent(parentHeader *core.Header) core.PreConfirmed {
107108
preConfirmedBlock := &core.Block{
108109
// pre_confirmed block does not have parent hash
109110
Header: &core.Header{
110-
SequencerAddress: parentHeader.SequencerAddress,
111111
Number: parentHeader.Number + 1,
112+
SequencerAddress: parentHeader.SequencerAddress,
112113
Timestamp: uint64(time.Now().Unix()),
113114
ProtocolVersion: parentHeader.ProtocolVersion,
114115
EventsBloom: core.EventsBloom(receipts),

0 commit comments

Comments
 (0)