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
8f59b112
Commit
8f59b112
authored
Oct 31, 2023
by
Tei Im
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add PendingSafeL2 to SyncStatus
parent
ce93b945
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
0 deletions
+7
-0
l2_verifier.go
op-e2e/actions/l2_verifier.go
+1
-0
server_test.go
op-node/node/server_test.go
+1
-0
driver.go
op-node/rollup/driver/driver.go
+1
-0
state.go
op-node/rollup/driver/state.go
+1
-0
sync_status.go
op-service/eth/sync_status.go
+2
-0
random.go
op-service/testutils/random.go
+1
-0
No files found.
op-e2e/actions/l2_verifier.go
View file @
8f59b112
...
@@ -157,6 +157,7 @@ func (s *L2Verifier) SyncStatus() *eth.SyncStatus {
...
@@ -157,6 +157,7 @@ func (s *L2Verifier) SyncStatus() *eth.SyncStatus {
UnsafeL2
:
s
.
L2Unsafe
(),
UnsafeL2
:
s
.
L2Unsafe
(),
SafeL2
:
s
.
L2Safe
(),
SafeL2
:
s
.
L2Safe
(),
FinalizedL2
:
s
.
L2Finalized
(),
FinalizedL2
:
s
.
L2Finalized
(),
PendingSafeL2
:
s
.
L2PendingSafe
(),
UnsafeL2SyncTarget
:
s
.
derivation
.
UnsafeL2SyncTarget
(),
UnsafeL2SyncTarget
:
s
.
derivation
.
UnsafeL2SyncTarget
(),
EngineSyncTarget
:
s
.
EngineSyncTarget
(),
EngineSyncTarget
:
s
.
EngineSyncTarget
(),
}
}
...
...
op-node/node/server_test.go
View file @
8f59b112
...
@@ -161,6 +161,7 @@ func randomSyncStatus(rng *rand.Rand) *eth.SyncStatus {
...
@@ -161,6 +161,7 @@ func randomSyncStatus(rng *rand.Rand) *eth.SyncStatus {
UnsafeL2
:
testutils
.
RandomL2BlockRef
(
rng
),
UnsafeL2
:
testutils
.
RandomL2BlockRef
(
rng
),
SafeL2
:
testutils
.
RandomL2BlockRef
(
rng
),
SafeL2
:
testutils
.
RandomL2BlockRef
(
rng
),
FinalizedL2
:
testutils
.
RandomL2BlockRef
(
rng
),
FinalizedL2
:
testutils
.
RandomL2BlockRef
(
rng
),
PendingSafeL2
:
testutils
.
RandomL2BlockRef
(
rng
),
UnsafeL2SyncTarget
:
testutils
.
RandomL2BlockRef
(
rng
),
UnsafeL2SyncTarget
:
testutils
.
RandomL2BlockRef
(
rng
),
EngineSyncTarget
:
testutils
.
RandomL2BlockRef
(
rng
),
EngineSyncTarget
:
testutils
.
RandomL2BlockRef
(
rng
),
}
}
...
...
op-node/rollup/driver/driver.go
View file @
8f59b112
...
@@ -60,6 +60,7 @@ type DerivationPipeline interface {
...
@@ -60,6 +60,7 @@ type DerivationPipeline interface {
Finalized
()
eth
.
L2BlockRef
Finalized
()
eth
.
L2BlockRef
SafeL2Head
()
eth
.
L2BlockRef
SafeL2Head
()
eth
.
L2BlockRef
UnsafeL2Head
()
eth
.
L2BlockRef
UnsafeL2Head
()
eth
.
L2BlockRef
PendingSafeL2Head
()
eth
.
L2BlockRef
Origin
()
eth
.
L1BlockRef
Origin
()
eth
.
L1BlockRef
EngineReady
()
bool
EngineReady
()
bool
EngineSyncTarget
()
eth
.
L2BlockRef
EngineSyncTarget
()
eth
.
L2BlockRef
...
...
op-node/rollup/driver/state.go
View file @
8f59b112
...
@@ -481,6 +481,7 @@ func (s *Driver) syncStatus() *eth.SyncStatus {
...
@@ -481,6 +481,7 @@ func (s *Driver) syncStatus() *eth.SyncStatus {
UnsafeL2
:
s
.
derivation
.
UnsafeL2Head
(),
UnsafeL2
:
s
.
derivation
.
UnsafeL2Head
(),
SafeL2
:
s
.
derivation
.
SafeL2Head
(),
SafeL2
:
s
.
derivation
.
SafeL2Head
(),
FinalizedL2
:
s
.
derivation
.
Finalized
(),
FinalizedL2
:
s
.
derivation
.
Finalized
(),
PendingSafeL2
:
s
.
derivation
.
PendingSafeL2Head
(),
UnsafeL2SyncTarget
:
s
.
derivation
.
UnsafeL2SyncTarget
(),
UnsafeL2SyncTarget
:
s
.
derivation
.
UnsafeL2SyncTarget
(),
EngineSyncTarget
:
s
.
derivation
.
EngineSyncTarget
(),
EngineSyncTarget
:
s
.
derivation
.
EngineSyncTarget
(),
}
}
...
...
op-service/eth/sync_status.go
View file @
8f59b112
...
@@ -32,6 +32,8 @@ type SyncStatus struct {
...
@@ -32,6 +32,8 @@ type SyncStatus struct {
// FinalizedL2 points to the L2 block that was derived fully from
// FinalizedL2 points to the L2 block that was derived fully from
// finalized L1 information, thus irreversible.
// finalized L1 information, thus irreversible.
FinalizedL2
L2BlockRef
`json:"finalized_l2"`
FinalizedL2
L2BlockRef
`json:"finalized_l2"`
// PendingSafeL2 points to the L2 block processed from the batch, but not consolidated to the safe block yet.
PendingSafeL2
L2BlockRef
`json:"pending_safe_l2"`
// UnsafeL2SyncTarget points to the first unprocessed unsafe L2 block.
// UnsafeL2SyncTarget points to the first unprocessed unsafe L2 block.
// It may be zeroed if there is no targeted block.
// It may be zeroed if there is no targeted block.
UnsafeL2SyncTarget
L2BlockRef
`json:"queued_unsafe_l2"`
UnsafeL2SyncTarget
L2BlockRef
`json:"queued_unsafe_l2"`
...
...
op-service/testutils/random.go
View file @
8f59b112
...
@@ -324,6 +324,7 @@ func RandomOutputResponse(rng *rand.Rand) *eth.OutputResponse {
...
@@ -324,6 +324,7 @@ func RandomOutputResponse(rng *rand.Rand) *eth.OutputResponse {
UnsafeL2
:
RandomL2BlockRef
(
rng
),
UnsafeL2
:
RandomL2BlockRef
(
rng
),
SafeL2
:
RandomL2BlockRef
(
rng
),
SafeL2
:
RandomL2BlockRef
(
rng
),
FinalizedL2
:
RandomL2BlockRef
(
rng
),
FinalizedL2
:
RandomL2BlockRef
(
rng
),
PendingSafeL2
:
RandomL2BlockRef
(
rng
),
EngineSyncTarget
:
RandomL2BlockRef
(
rng
),
EngineSyncTarget
:
RandomL2BlockRef
(
rng
),
},
},
}
}
...
...
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