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

Improve syncronizer tracker in DAC #66

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Improve syncronizer tracker in DAC #66

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae91194
Imporovements
begmaroman Mar 18, 2024
1d13544
Imporovements
begmaroman Mar 18, 2024
780cb85
Fixed linter
begmaroman Mar 18, 2024
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
121 changes: 57 additions & 64 deletions sequencer/tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/0xPolygon/cdk-data-availability/etherman/smartcontracts/polygonvalidium"
"github.com/0xPolygon/cdk-data-availability/log"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event"
)

// Tracker watches the contract for relevant changes to the sequencer
Expand Down Expand Up @@ -96,45 +97,41 @@ func (st *Tracker) trackAddrChanges(ctx context.Context) {
events := make(chan *polygonvalidium.PolygonvalidiumSetTrustedSequencer)
defer close(events)

ctx, cancel := context.WithTimeout(ctx, st.timeout)
defer cancel()

var sub event.Subscription

initSubscription := func() {
var err error
for sub, err = st.client.WatchSetTrustedSequencer(ctx, events); err != nil; {
<-time.After(st.retry)

if sub, err = st.client.WatchSetTrustedSequencer(ctx, events); err != nil {
log.Errorf("error subscribing to trusted sequencer event, retrying: %v", err)
}
}
}

initSubscription()

for {
select {
case e := <-events:
log.Infof("new trusted sequencer address: %v", e.NewTrustedSequencer)
st.setAddr(e.NewTrustedSequencer)
case <-ctx.Done():
if ctx.Err() != nil && ctx.Err() != context.DeadlineExceeded {
log.Warnf("context cancelled: %v", ctx.Err())
}
default:
ctx, cancel := context.WithTimeout(ctx, st.timeout)

sub, err := st.client.WatchSetTrustedSequencer(ctx, events)

// if no subscription, retry until established
for err != nil {
<-time.After(st.retry)

if sub, err = st.client.WatchSetTrustedSequencer(ctx, events); err != nil {
log.Errorf("error subscribing to trusted sequencer event, retrying: %v", err)
}
}

// wait on events, timeouts, and signals to stop
select {
case e := <-events:
log.Infof("new trusted sequencer address: %v", e.NewTrustedSequencer)
st.setAddr(e.NewTrustedSequencer)
case err := <-sub.Err():
log.Warnf("subscription error, resubscribing: %v", err)
case <-ctx.Done():
// Deadline exceeded is expected since we use finite context timeout
if ctx.Err() != nil && ctx.Err() != context.DeadlineExceeded {
log.Warnf("re-establishing subscription: %v", ctx.Err())
}
case <-st.stop:
if sub != nil {
sub.Unsubscribe()
}
cancel()
return
case err := <-sub.Err():
log.Warnf("subscription error, resubscribing: %v", err)
initSubscription()
case <-st.stop:
if sub != nil {
sub.Unsubscribe()
}
return
}
}
}
Expand All @@ -143,45 +140,41 @@ func (st *Tracker) trackUrlChanges(ctx context.Context) {
events := make(chan *polygonvalidium.PolygonvalidiumSetTrustedSequencerURL)
defer close(events)

ctx, cancel := context.WithTimeout(ctx, st.timeout)
defer cancel()

var sub event.Subscription

initSubscription := func() {
var err error
for sub, err = st.client.WatchSetTrustedSequencerURL(ctx, events); err != nil; {
<-time.After(st.retry)

if sub, err = st.client.WatchSetTrustedSequencerURL(ctx, events); err != nil {
log.Errorf("error subscribing to trusted sequencer event, retrying: %v", err)
}
}
}

initSubscription()

for {
select {
case e := <-events:
log.Infof("new trusted sequencer url: %v", e.NewTrustedSequencerURL)
st.setUrl(e.NewTrustedSequencerURL)
case <-ctx.Done():
if ctx.Err() != nil && ctx.Err() != context.DeadlineExceeded {
log.Warnf("context cancelled: %v", ctx.Err())
}
default:
ctx, cancel := context.WithTimeout(ctx, st.timeout)

sub, err := st.client.WatchSetTrustedSequencerURL(ctx, events)

// if no subscription, retry until established
for err != nil {
<-time.After(st.retry)

if sub, err = st.client.WatchSetTrustedSequencerURL(ctx, events); err != nil {
log.Errorf("error subscribing to trusted sequencer event, retrying: %v", err)
}
}

// wait on events, timeouts, and signals to stop
select {
case e := <-events:
log.Infof("new trusted sequencer url: %v", e.NewTrustedSequencerURL)
st.setUrl(e.NewTrustedSequencerURL)
case err := <-sub.Err():
log.Warnf("subscription error, resubscribing: %v", err)
case <-ctx.Done():
// Deadline exceeded is expected since we use finite context timeout
if ctx.Err() != nil && ctx.Err() != context.DeadlineExceeded {
log.Warnf("re-establishing subscription: %v", ctx.Err())
}
case <-st.stop:
if sub != nil {
sub.Unsubscribe()
}
cancel()
return
case err := <-sub.Err():
log.Warnf("subscription error, resubscribing: %v", err)
initSubscription()
case <-st.stop:
if sub != nil {
sub.Unsubscribe()
}
return
}
}
}
Expand Down
Loading