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
0978fd71
Unverified
Commit
0978fd71
authored
Aug 06, 2022
by
Diederik Loerakker
Committed by
GitHub
Aug 06, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-node: reorgs should be typed to force pipeline resets (#3185)
parent
faf2e493
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
engine_queue.go
op-node/rollup/derive/engine_queue.go
+1
-1
l1_traversal.go
op-node/rollup/derive/l1_traversal.go
+1
-1
progress.go
op-node/rollup/derive/progress.go
+3
-3
No files found.
op-node/rollup/derive/engine_queue.go
View file @
0978fd71
...
@@ -279,7 +279,7 @@ func (eq *EngineQueue) forceNextSafeAttributes(ctx context.Context) error {
...
@@ -279,7 +279,7 @@ func (eq *EngineQueue) forceNextSafeAttributes(ctx context.Context) error {
eq
.
safeAttributes
[
0
]
.
Transactions
=
deposits
eq
.
safeAttributes
[
0
]
.
Transactions
=
deposits
return
nil
return
nil
}
}
return
fmt
.
Errorf
(
"critical: failed to process block with only deposit transactions: %v"
,
payloadErr
)
return
NewCriticalError
(
payloadErr
,
"failed to process block with only deposit transactions"
)
}
}
ref
,
err
:=
PayloadToBlockRef
(
payload
,
&
eq
.
cfg
.
Genesis
)
ref
,
err
:=
PayloadToBlockRef
(
payload
,
&
eq
.
cfg
.
Genesis
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
op-node/rollup/derive/l1_traversal.go
View file @
0978fd71
...
@@ -56,7 +56,7 @@ func (l1t *L1Traversal) Step(ctx context.Context, outer Progress) error {
...
@@ -56,7 +56,7 @@ func (l1t *L1Traversal) Step(ctx context.Context, outer Progress) error {
return
nil
// nil, don't make the pipeline restart if the RPC fails
return
nil
// nil, don't make the pipeline restart if the RPC fails
}
}
if
l1t
.
progress
.
Origin
.
Hash
!=
nextL1Origin
.
ParentHash
{
if
l1t
.
progress
.
Origin
.
Hash
!=
nextL1Origin
.
ParentHash
{
return
fmt
.
Errorf
(
"detected L1 reorg from %s to %s: %w"
,
l1t
.
progress
.
Origin
,
nextL1Origin
,
ReorgErr
)
return
NewResetError
(
ReorgErr
,
fmt
.
Sprintf
(
"detected L1 reorg from %s to %s"
,
l1t
.
progress
.
Origin
,
nextL1Origin
)
)
}
}
l1t
.
progress
.
Origin
=
nextL1Origin
l1t
.
progress
.
Origin
=
nextL1Origin
l1t
.
progress
.
Closed
=
false
l1t
.
progress
.
Closed
=
false
...
...
op-node/rollup/derive/progress.go
View file @
0978fd71
...
@@ -24,12 +24,12 @@ func (pr *Progress) Update(outer Progress) (changed bool, err error) {
...
@@ -24,12 +24,12 @@ func (pr *Progress) Update(outer Progress) (changed bool, err error) {
if
pr
.
Closed
{
if
pr
.
Closed
{
if
outer
.
Closed
{
if
outer
.
Closed
{
if
pr
.
Origin
.
ID
()
!=
outer
.
Origin
.
ID
()
{
if
pr
.
Origin
.
ID
()
!=
outer
.
Origin
.
ID
()
{
return
true
,
fmt
.
Errorf
(
"outer stage changed origin from %s to %s without opening it"
,
pr
.
Origin
,
outer
.
Origin
)
return
true
,
NewResetError
(
ReorgErr
,
fmt
.
Sprintf
(
"outer stage changed origin from %s to %s without opening it"
,
pr
.
Origin
,
outer
.
Origin
)
)
}
}
return
false
,
nil
return
false
,
nil
}
else
{
}
else
{
if
pr
.
Origin
.
Hash
!=
outer
.
Origin
.
ParentHash
{
if
pr
.
Origin
.
Hash
!=
outer
.
Origin
.
ParentHash
{
return
true
,
fmt
.
Errorf
(
"detected internal pipeline reorg of L1 origin data from %s to %s: %w"
,
pr
.
Origin
,
outer
.
Origin
,
ReorgErr
)
return
true
,
NewResetError
(
ReorgErr
,
fmt
.
Sprintf
(
"detected internal pipeline reorg of L1 origin data from %s to %s"
,
pr
.
Origin
,
outer
.
Origin
)
)
}
}
pr
.
Origin
=
outer
.
Origin
pr
.
Origin
=
outer
.
Origin
pr
.
Closed
=
false
pr
.
Closed
=
false
...
@@ -37,7 +37,7 @@ func (pr *Progress) Update(outer Progress) (changed bool, err error) {
...
@@ -37,7 +37,7 @@ func (pr *Progress) Update(outer Progress) (changed bool, err error) {
}
}
}
else
{
}
else
{
if
pr
.
Origin
.
ID
()
!=
outer
.
Origin
.
ID
()
{
if
pr
.
Origin
.
ID
()
!=
outer
.
Origin
.
ID
()
{
return
true
,
fmt
.
Errorf
(
"outer stage changed origin from %s to %s before closing it"
,
pr
.
Origin
,
outer
.
Origin
)
return
true
,
NewResetError
(
ReorgErr
,
fmt
.
Sprintf
(
"outer stage changed origin from %s to %s before closing it"
,
pr
.
Origin
,
outer
.
Origin
)
)
}
}
if
outer
.
Closed
{
if
outer
.
Closed
{
pr
.
Closed
=
true
pr
.
Closed
=
true
...
...
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