Add UseEscapeHatch and replace the existing UseEscapeHatch with EnableEscapeHatch
#396
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -87,9 +87,8 @@ type TransactionStreamer struct { | |
| espressoSwitchDelayThreshold uint64 | ||
| espressoMaxTransactionSize uint64 | ||
| // Public these fields for testing | ||
| EscapeHatchEnabled bool | ||
| UseEscapeHatch bool | ||
| } | ||
|
|
||
| type TransactionStreamerConfig struct { | ||
|
|
@@ -142,6 +141,7 @@ func NewTransactionStreamer( | |
| fatalErrChan: fatalErrChan, | ||
| config: config, | ||
| snapSyncConfig: snapSyncConfig, | ||
| EscapeHatchEnabled: false, | ||
| } | ||
|
|
||
| err := streamer.cleanupInconsistentState() | ||
|
|
@@ -1271,18 +1271,18 @@ func (s *TransactionStreamer) pollSubmittedTransactionForFinality(ctx context.Co | |
| if err != nil { | ||
| return fmt.Errorf("failed to fetch the submitted transaction hash (hash: %s): %w", submittedTxHash.String(), err) | ||
| } | ||
| height := data.BlockHeight | ||
|
|
||
| header, err := s.espressoClient.FetchHeaderByHeight(ctx, height) | ||
| if err != nil { | ||
| return fmt.Errorf("could not get the header (height: %d): %w", height, err) | ||
| } | ||
|
|
||
| log.Info("Fetching Merkle Root at hotshot height: ", height) | ||
| // Verify the merkle proof | ||
| snapshot, err := s.lightClientReader.FetchMerkleRoot(height, nil) | ||
| if err != nil { | ||
| return fmt.Errorf("%w (height: %d): %w", EspressoValidationErr, height, err) | ||
| } | ||
|
|
||
| if snapshot.Height <= height { | ||
|
|
@@ -1345,7 +1345,7 @@ func (s *TransactionStreamer) pollSubmittedTransactionForFinality(ctx context.Co | |
|
|
||
| batch := s.db.NewBatch() | ||
| if err := s.cleanEspressoSubmittedData(batch); err != nil { | ||
| return err | ||
| } | ||
| lastConfirmedPos := submittedTxnPos[len(submittedTxnPos)-1] | ||
| if err := s.setEspressoLastConfirmedPos(batch, &lastConfirmedPos); err != nil { | ||
|
|
@@ -1707,67 +1707,37 @@ func (s *TransactionStreamer) submitEspressoTransactions(ctx context.Context) ti | |
| return s.espressoTxnsPollingInterval | ||
| } | ||
|
|
||
| // Make sure useEscapeHatch is true | ||
| func (s *TransactionStreamer) checkEspressoLiveness() error { | ||
| live, err := s.lightClientReader.IsHotShotLive(s.espressoSwitchDelayThreshold) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // If escape hatch is activated, the only thing is to check if hotshot is live again | ||
| if s.EscapeHatchEnabled { | ||
| if live { | ||
| log.Info("HotShot is up, disabling the escape hatch") | ||
| s.EscapeHatchEnabled = false | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // If escape hatch is disabled, hotshot is live, everything is fine | ||
| if live { | ||
| return nil | ||
| } | ||
|
|
||
| // If escape hatch is on, and hotshot is down | ||
| log.Warn("enabling the escape hatch, hotshot is down") | ||
| s.EscapeHatchEnabled = true | ||
|
|
||
| // Skip the espresso verification for the submitted messages | ||
|
There was a problem hiding this comment. Remove this complicated logic because previously we used the L1 height in the espresso block to determine if the transaction will be finalized even though the escape hatch was on. After some investigation, I think this L1 height is in fact not valid. It is the height when the espresso block is created. So there is a risk that at this L1 height hotshot is live but the submitted transaction fails to be committed. There was a problem hiding this comment. Yea that sounds good, if escape hatch is turned on and hotshot is down we can skip verification. @ImJeremyHe feel free to remove this! |
||
| submitted, err := s.getEspressoSubmittedPos() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if len(submitted) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| last := submitted[len(submitted)-1] | ||
|
|
@@ -1796,7 +1766,7 @@ func (s *TransactionStreamer) checkEspressoLiveness(ctx context.Context) error { | |
| return nil | ||
| } | ||
|
|
||
| var espressoMerkleProofEphemeralErrorHandler = util.NewEphemeralErrorHandler(80*time.Minute, EspressoValidationErr.Error(), time.Hour) | ||
| var espressoTransactionEphemeralErrorHandler = util.NewEphemeralErrorHandler(3*time.Minute, EspressoFetchTransactionErr.Error(), time.Minute) | ||
|
|
||
| func getLogLevel(err error) func(string, ...interface{}) { | ||
|
|
@@ -1808,9 +1778,9 @@ func getLogLevel(err error) func(string, ...interface{}) { | |
|
|
||
| func (s *TransactionStreamer) espressoSwitch(ctx context.Context, ignored struct{}) time.Duration { | ||
| retryRate := s.espressoTxnsPollingInterval * 50 | ||
Sneh1999 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| var err error | ||
| if s.UseEscapeHatch { | ||
| err = s.checkEspressoLiveness() | ||
| if err != nil { | ||
| if ctx.Err() != nil { | ||
| return 0 | ||
|
|
@@ -1819,31 +1789,29 @@ func (s *TransactionStreamer) espressoSwitch(ctx context.Context, ignored struct | |
| logLevel("error checking escape hatch, will retry", "err", err) | ||
| return retryRate | ||
| } | ||
| espressoTransactionEphemeralErrorHandler.Reset() | ||
| } | ||
| err = s.pollSubmittedTransactionForFinality(ctx) | ||
| if err != nil { | ||
| if ctx.Err() != nil { | ||
| return 0 | ||
| } | ||
| logLevel := getLogLevel(err) | ||
| logLevel("error polling finality, will retry", "err", err) | ||
| return retryRate | ||
| } | ||
| espressoMerkleProofEphemeralErrorHandler.Reset() | ||
|
|
||
| shouldSubmit := s.shouldSubmitEspressoTransaction() | ||
| if shouldSubmit { | ||
| return s.submitEspressoTransactions(ctx) | ||
| } | ||
|
|
||
| return s.espressoTxnsPollingInterval | ||
| } | ||
|
|
||
| func (s *TransactionStreamer) shouldSubmitEspressoTransaction() bool { | ||
| return !s.EscapeHatchEnabled | ||
| } | ||
|
|
||
| func (s *TransactionStreamer) Start(ctxIn context.Context) error { | ||
|
|
||
This file contains 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 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems unnecesary for the batch poster.
We can use
lightClientAddressandespressoClientto check if we are using espresso mode