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

cherry-pick synchronizer support forkid 9 (#3496) #3513

Merged
merged 1 commit into from
Apr 3, 2024
Merged

cherry-pick synchronizer support forkid 9 (#3496) #3513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions state/forkid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ const (
FORKID_ETROG = 7
// FORKID_ELDERBERRY is the fork id 8
FORKID_ELDERBERRY = 8
// FORKID_9 is the fork id 9
FORKID_9 = 9
)

// ForkIDInterval is a fork id interval
Expand Down
4 changes: 3 additions & 1 deletion synchronizer/actions/forksids.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ const (
ForkIDEtrog = ForkIdType(7) //nolint:gomnd
// ForkIDElderberry is the forkId for Elderberry
ForkIDElderberry = ForkIdType(8) //nolint:gomnd
// ForkID9 is the forkId for 9
ForkID9 = ForkIdType(9) //nolint:gomnd
)

var (
Expand All @@ -20,7 +22,7 @@ var (
ForksIdAll = []ForkIdType{WildcardForkId}

// ForksIdOnlyElderberry support only elderberry forkId
ForksIdOnlyElderberry = []ForkIdType{ForkIDElderberry}
ForksIdOnlyElderberry = []ForkIdType{ForkIDElderberry, ForkID9}

// ForksIdOnlyEtrog support only etrog forkId
ForksIdOnlyEtrog = []ForkIdType{ForkIDEtrog}
Expand Down
1 change: 1 addition & 0 deletions synchronizer/synchronizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ func NewSynchronizer(
res.syncTrustedStateExecutor = l2_shared.NewSyncTrustedStateExecutorSelector(map[uint64]syncinterfaces.SyncTrustedStateExecutor{
uint64(state.FORKID_ETROG): syncTrustedStateEtrog,
uint64(state.FORKID_ELDERBERRY): syncTrustedStateEtrog,
uint64(state.FORKID_9): syncTrustedStateEtrog,
}, res.state)
}
var l1checkerL2Blocks *actions.CheckL2BlockHash
Expand Down
Loading