forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 281
feat: follower node sync from DA #1098
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
ea5a603
port changes from #1013
jonastheis b30006f
port changes from #1068
jonastheis de37d47
go.mod tidy
jonastheis e34fecf
fix compile error
jonastheis 1327771
fix goimports
jonastheis b05954d
fix log
jonastheis ce8f785
address review comments
jonastheis f10c383
upgrade golang.org/x/net to 0.23.0
jonastheis cb0a90e
Merge branch 'develop' into jt/l1-follower-mode
jonastheis 3f26de1
bump version
Thegaram 58e4586
remove unused flag
Thegaram f23a253
update da-codec commit
Thegaram File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package backoff | ||
|
||
import ( | ||
"math" | ||
"math/rand" | ||
"time" | ||
) | ||
|
||
// Exponential is a backoff strategy that increases the delay between retries exponentially. | ||
type Exponential struct { | ||
attempt int | ||
|
||
maxJitter time.Duration | ||
|
||
min time.Duration | ||
max time.Duration | ||
} | ||
|
||
func NewExponential(minimum, maximum, maxJitter time.Duration) *Exponential { | ||
return &Exponential{ | ||
min: minimum, | ||
max: maximum, | ||
maxJitter: maxJitter, | ||
} | ||
} | ||
jonastheis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
func (e *Exponential) NextDuration() time.Duration { | ||
var jitter time.Duration | ||
if e.maxJitter > 0 { | ||
jitter = time.Duration(rand.Int63n(e.maxJitter.Nanoseconds())) | ||
} | ||
jonastheis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
minFloat := float64(e.min) | ||
duration := math.Pow(2, float64(e.attempt)) * minFloat | ||
|
||
// limit at configured maximum | ||
if duration > float64(e.max) { | ||
duration = float64(e.max) | ||
} | ||
jonastheis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
e.attempt++ | ||
return time.Duration(duration) + jitter | ||
} | ||
|
||
func (e *Exponential) Reset() { | ||
e.attempt = 0 | ||
} | ||
|
||
func (e *Exponential) Attempt() int { | ||
return e.attempt | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package backoff | ||
|
||
import ( | ||
"testing" | ||
"time" | ||
|
||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestExponentialBackoff(t *testing.T) { | ||
t.Run("Multiple attempts", func(t *testing.T) { | ||
e := NewExponential(100*time.Millisecond, 10*time.Second, 0) | ||
expectedDurations := []time.Duration{ | ||
100 * time.Millisecond, | ||
200 * time.Millisecond, | ||
400 * time.Millisecond, | ||
800 * time.Millisecond, | ||
1600 * time.Millisecond, | ||
3200 * time.Millisecond, | ||
6400 * time.Millisecond, | ||
10 * time.Second, // capped at max | ||
} | ||
for i, expected := range expectedDurations { | ||
require.Equal(t, expected, e.NextDuration(), "attempt %d", i) | ||
} | ||
}) | ||
|
||
t.Run("Jitter added", func(t *testing.T) { | ||
e := NewExponential(1*time.Second, 10*time.Second, 1*time.Second) | ||
duration := e.NextDuration() | ||
require.GreaterOrEqual(t, duration, 1*time.Second) | ||
require.Less(t, duration, 2*time.Second) | ||
}) | ||
|
||
t.Run("Edge case: min > max", func(t *testing.T) { | ||
e := NewExponential(10*time.Second, 5*time.Second, 0) | ||
require.Equal(t, 5*time.Second, e.NextDuration()) | ||
}) | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
package common | ||
|
||
import ( | ||
"container/heap" | ||
) | ||
|
||
// Heap is a generic min-heap (or max-heap, depending on Comparable behavior) implementation. | ||
type Heap[T Comparable[T]] struct { | ||
heap innerHeap[T] | ||
} | ||
|
||
func NewHeap[T Comparable[T]]() *Heap[T] { | ||
return &Heap[T]{ | ||
heap: make(innerHeap[T], 0), | ||
} | ||
} | ||
|
||
func (h *Heap[T]) Len() int { | ||
return len(h.heap) | ||
} | ||
|
||
func (h *Heap[T]) Push(element T) *HeapElement[T] { | ||
heapElement := NewHeapElement(element) | ||
heap.Push(&h.heap, heapElement) | ||
|
||
return heapElement | ||
} | ||
|
||
func (h *Heap[T]) Pop() *HeapElement[T] { | ||
return heap.Pop(&h.heap).(*HeapElement[T]) | ||
} | ||
|
||
func (h *Heap[T]) Peek() *HeapElement[T] { | ||
if h.Len() == 0 { | ||
return nil | ||
} | ||
|
||
return h.heap[0] | ||
} | ||
|
||
func (h *Heap[T]) Remove(element *HeapElement[T]) { | ||
heap.Remove(&h.heap, element.index) | ||
} | ||
|
||
func (h *Heap[T]) Clear() { | ||
h.heap = make(innerHeap[T], 0) | ||
} | ||
|
||
type innerHeap[T Comparable[T]] []*HeapElement[T] | ||
|
||
func (h innerHeap[T]) Len() int { | ||
return len(h) | ||
} | ||
|
||
func (h innerHeap[T]) Less(i, j int) bool { | ||
return h[i].Value().CompareTo(h[j].Value()) < 0 | ||
} | ||
|
||
func (h innerHeap[T]) Swap(i, j int) { | ||
h[i], h[j] = h[j], h[i] | ||
h[i].index, h[j].index = i, j | ||
} | ||
|
||
func (h *innerHeap[T]) Push(x interface{}) { | ||
data := x.(*HeapElement[T]) | ||
*h = append(*h, data) | ||
data.index = len(*h) - 1 | ||
} | ||
|
||
func (h *innerHeap[T]) Pop() interface{} { | ||
n := len(*h) | ||
element := (*h)[n-1] | ||
(*h)[n-1] = nil // avoid memory leak | ||
*h = (*h)[:n-1] | ||
element.index = -1 | ||
|
||
return element | ||
} | ||
|
||
// Comparable is an interface for types that can be compared. | ||
type Comparable[T any] interface { | ||
// CompareTo compares x with other. | ||
// To create a min heap, return: | ||
// -1 if x < other | ||
// 0 if x == other | ||
// +1 if x > other | ||
// To create a max heap, return the opposite. | ||
CompareTo(other T) int | ||
} | ||
|
||
// HeapElement is a wrapper around the value stored in the heap. | ||
type HeapElement[T Comparable[T]] struct { | ||
value T | ||
index int | ||
} | ||
|
||
func NewHeapElement[T Comparable[T]](value T) *HeapElement[T] { | ||
return &HeapElement[T]{ | ||
value: value, | ||
} | ||
} | ||
|
||
func (h *HeapElement[T]) Value() T { | ||
return h.value | ||
} | ||
|
||
func (h *HeapElement[T]) Index() int { | ||
return h.index | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package common | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
type Int int | ||
|
||
func (i Int) CompareTo(other Int) int { | ||
if i < other { | ||
return -1 | ||
} else if i > other { | ||
return 1 | ||
} else { | ||
return 0 | ||
} | ||
} | ||
|
||
func TestHeap(t *testing.T) { | ||
h := NewHeap[Int]() | ||
|
||
require.Equal(t, 0, h.Len(), "Heap should be empty initially") | ||
|
||
h.Push(Int(3)) | ||
h.Push(Int(1)) | ||
h.Push(Int(2)) | ||
|
||
require.Equal(t, 3, h.Len(), "Heap should have three elements after pushing") | ||
|
||
require.EqualValues(t, 1, h.Pop(), "Pop should return the smallest element") | ||
require.Equal(t, 2, h.Len(), "Heap should have two elements after popping") | ||
|
||
require.EqualValues(t, 2, h.Pop(), "Pop should return the next smallest element") | ||
require.Equal(t, 1, h.Len(), "Heap should have one element after popping") | ||
|
||
require.EqualValues(t, 3, h.Pop(), "Pop should return the last element") | ||
require.Equal(t, 0, h.Len(), "Heap should be empty after popping all elements") | ||
jonastheis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
package common | ||
|
||
// ShrinkingMap is a map that shrinks itself (by allocating a new map) after a certain number of deletions have been performed. | ||
// If shrinkAfterDeletionsCount is set to <=0, the map will never shrink. | ||
// This is useful to prevent memory leaks in long-running processes that delete a lot of keys from a map. | ||
// See here for more details: https://github.com/golang/go/issues/20135 | ||
type ShrinkingMap[K comparable, V any] struct { | ||
m map[K]V | ||
deletedKeys int | ||
|
||
shrinkAfterDeletionsCount int | ||
} | ||
|
||
func NewShrinkingMap[K comparable, V any](shrinkAfterDeletionsCount int) *ShrinkingMap[K, V] { | ||
return &ShrinkingMap[K, V]{ | ||
m: make(map[K]V), | ||
shrinkAfterDeletionsCount: shrinkAfterDeletionsCount, | ||
} | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) Set(key K, value V) { | ||
s.m[key] = value | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) Get(key K) (value V, exists bool) { | ||
value, exists = s.m[key] | ||
return value, exists | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) Has(key K) bool { | ||
_, exists := s.m[key] | ||
return exists | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) Delete(key K) (deleted bool) { | ||
if _, exists := s.m[key]; !exists { | ||
return false | ||
} | ||
|
||
delete(s.m, key) | ||
s.deletedKeys++ | ||
|
||
if s.shouldShrink() { | ||
s.shrink() | ||
} | ||
|
||
return true | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) Size() (size int) { | ||
return len(s.m) | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) Clear() { | ||
s.m = make(map[K]V) | ||
s.deletedKeys = 0 | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) shouldShrink() bool { | ||
return s.shrinkAfterDeletionsCount > 0 && s.deletedKeys >= s.shrinkAfterDeletionsCount | ||
} | ||
|
||
func (s *ShrinkingMap[K, V]) shrink() { | ||
newMap := make(map[K]V, len(s.m)) | ||
for k, v := range s.m { | ||
newMap[k] = v | ||
} | ||
|
||
s.m = newMap | ||
s.deletedKeys = 0 | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.