Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
42b1f303
Unverified
Commit
42b1f303
authored
Jul 08, 2022
by
Diederik Loerakker
Committed by
GitHub
Jul 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-node: clip derivation reset to not go past L1 genesis (#2910)
parent
b9a90f32
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
batch_queue.go
op-node/rollup/derive/batch_queue.go
+4
-0
channel_bank.go
op-node/rollup/derive/channel_bank.go
+1
-1
No files found.
op-node/rollup/derive/batch_queue.go
View file @
42b1f303
...
@@ -99,6 +99,10 @@ func (bq *BatchQueue) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error
...
@@ -99,6 +99,10 @@ func (bq *BatchQueue) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error
}
else
{
}
else
{
startNumber
-=
bq
.
config
.
SeqWindowSize
startNumber
-=
bq
.
config
.
SeqWindowSize
}
}
// clip to genesis
if
startNumber
<
bq
.
config
.
Genesis
.
L1
.
Number
{
startNumber
=
bq
.
config
.
Genesis
.
L1
.
Number
}
l1BlockStart
,
err
:=
l1Fetcher
.
L1BlockRefByNumber
(
ctx
,
startNumber
)
l1BlockStart
,
err
:=
l1Fetcher
.
L1BlockRefByNumber
(
ctx
,
startNumber
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
...
op-node/rollup/derive/channel_bank.go
View file @
42b1f303
...
@@ -221,7 +221,7 @@ func (ib *ChannelBank) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error
...
@@ -221,7 +221,7 @@ func (ib *ChannelBank) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error
ib
.
resetting
=
true
ib
.
resetting
=
true
return
nil
return
nil
}
}
if
ib
.
progress
.
Origin
.
Time
+
ib
.
cfg
.
ChannelTimeout
<
ib
.
next
.
Progress
()
.
Origin
.
Time
||
ib
.
progress
.
Origin
.
Number
==
0
{
if
ib
.
progress
.
Origin
.
Time
+
ib
.
cfg
.
ChannelTimeout
<
ib
.
next
.
Progress
()
.
Origin
.
Time
||
ib
.
progress
.
Origin
.
Number
<=
ib
.
cfg
.
Genesis
.
L1
.
Number
{
ib
.
log
.
Debug
(
"found reset origin for channel bank"
,
"origin"
,
ib
.
progress
.
Origin
)
ib
.
log
.
Debug
(
"found reset origin for channel bank"
,
"origin"
,
ib
.
progress
.
Origin
)
ib
.
resetting
=
false
ib
.
resetting
=
false
return
io
.
EOF
return
io
.
EOF
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment