github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-01-15 00:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

testing fixes

Browse Source
This commit is contained in:
colinlyguo
2023-12-19 06:39:04 +08:00
parent f617da73f6
commit c194fd74cb
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridge-history-api/internal/controller/fetcher/l1_fetcher.go
View File

@@ -54,7 +54,7 @@ func (c *L1MessageFetcher) Start() {
if batchSyncedHeight > l1SyncHeight {
l1SyncHeight = batchSyncedHeight
}
if c.cfg.StartHeight > c.l1SyncHeight {
if c.cfg.StartHeight > l1SyncHeight {
l1SyncHeight = c.cfg.StartHeight - 1
}

10
bridge-history-api/internal/logic/l1_reorg_handling.go
View File

@@ -34,11 +34,11 @@ func (l *L1ReorgHandlingLogic) HandleL1Reorg(ctx context.Context, blockNumber ui
}
if reorgDetected {
resyncHeight := uint64(1)
var resyncHeight uint64
if blockNumber > L1ReorgSafeDepth {
resyncHeight = blockNumber - L1ReorgSafeDepth
}
return true, resyncHeight - 1, nil
return true, resyncHeight, nil
}
return false, 0, nil
@@ -47,17 +47,17 @@ func (l *L1ReorgHandlingLogic) HandleL1Reorg(ctx context.Context, blockNumber ui
func (l *L1ReorgHandlingLogic) detectReorg(ctx context.Context, blockNumber uint64, blockHash common.Hash) (bool, error) {
currentHeader, err := l.client.HeaderByNumber(ctx, big.NewInt(0).SetUint64(blockNumber))
if err != nil {
log.Error("failed to get header by number", "height", blockNumber, "err", err)
log.Error("failed to get L1 header by number", "height", blockNumber, "err", err)
return false, err
}
if currentHeader == nil {
log.Warn("cannot fetch remote block header", "height", blockNumber, "last block hash", blockHash.String())
log.Warn("cannot fetch current L1 block header", "height", blockNumber, "last block hash", blockHash.String())
return true, nil
}
if blockHash != currentHeader.Hash() {
log.Warn("block hash mismatch, reorg happened", "height", blockNumber, "last block hash", blockHash.String(), "current block hash", currentHeader.Hash().String())
log.Warn("block hash mismatch, L1 reorg happened", "height", blockNumber, "last block hash", blockHash.String(), "current block hash", currentHeader.Hash().String())
return true, nil
}

12
bridge-history-api/internal/logic/l2_reorg_handling.go
View File

@@ -34,11 +34,11 @@ func (l *L2ReorgHandlingLogic) HandleL2Reorg(ctx context.Context, blockNumber ui
}
if l2ReorgDetected {
startHeight := uint64(1)
var resyncHeight uint64
if blockNumber > L2ReorgSafeDepth {
startHeight = blockNumber - L2ReorgSafeDepth
resyncHeight = blockNumber - L2ReorgSafeDepth
}
return true, startHeight - 1, nil
return true, resyncHeight, nil
}
return false, 0, nil
@@ -47,17 +47,17 @@ func (l *L2ReorgHandlingLogic) HandleL2Reorg(ctx context.Context, blockNumber ui
func (l *L2ReorgHandlingLogic) detectL2Reorg(ctx context.Context, blockNumber uint64, blockHash common.Hash) (bool, error) {
currentHeader, err := l.client.HeaderByNumber(ctx, big.NewInt(0).SetUint64(blockNumber))
if err != nil {
log.Error("failed to get header by number", "height", blockNumber, "err", err)
log.Error("failed to get L2 header by number", "height", blockNumber, "err", err)
return false, err
}
if currentHeader == nil {
log.Warn("cannot fetch remote block header", "height", blockNumber, "last block hash", blockHash.String())
log.Warn("cannot fetch current L2 block header", "height", blockNumber, "last block hash", blockHash.String())
return true, nil
}
if blockHash != currentHeader.Hash() {
log.Warn("block hash mismatch, reorg happened", "height", blockNumber, "last block hash", blockHash.String(), "current block hash", currentHeader.Hash().String())
log.Warn("block hash mismatch, L2 reorg happened", "height", blockNumber, "last block hash", blockHash.String(), "current block hash", currentHeader.Hash().String())
return true, nil
}