github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-04-23 03:00:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat/prover_task_unique

Browse Source
This commit is contained in:
georgehao
2023-08-21 17:48:29 +08:00
committed by GitHub
parent 0a5465a750 c3b2f13fe0
commit 04fe23f95c
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bridge/internal/controller/sender/sender.go
View File

@@ -494,11 +494,6 @@ func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64)
}
}
} else {
log.Debug("Transaction resubmitted successfully",
"original tx hash", pending.tx.Hash().String(),
"new tx hash", tx.Hash().String(),
"new submit block number", number)
// flush submitAt
pending.tx = tx
pending.submitAt = number

2
common/version/version.go
View File

@@ -6,7 +6,7 @@ import (
"strings"
)
var tag = "v4.1.82"
var tag = "v4.1.83"
var commit = func() string {
if info, ok := debug.ReadBuildInfo(); ok {