forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: treat JSON errors as CCC error (#922)

Browse source
This commit is contained in:
Ömer Faruk Irmak 2024-07-25 17:35:32 +03:00 committed by GitHub
parent df3713e840
commit e3bfb5fd46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rollup/pipeline/pipeline.go
View file

@ -362,7 +362,7 @@ func (p *Pipeline) encodeStage(traces <-chan *BlockCandidate) <-chan *BlockCandi
trace.RustTrace = circuitcapacitychecker.MakeRustTrace(trace.LastTrace, buffer) trace.RustTrace = circuitcapacitychecker.MakeRustTrace(trace.LastTrace, buffer)
if trace.RustTrace == nil { if trace.RustTrace == nil {
log.Error("making rust trace", "txHash", trace.LastTrace.Transactions[0].TxHash) log.Error("making rust trace", "txHash", trace.LastTrace.Transactions[0].TxHash)
return // ignore the error here, CCC stage will catch it and treat it as a CCC error
} }
} }
encodeTimer.UpdateSince(encodeStart) encodeTimer.UpdateSince(encodeStart)
@ -431,7 +431,11 @@ func (p *Pipeline) cccStage(candidates <-chan *BlockCandidate, deadline time.Tim
var accRows *types.RowConsumption var accRows *types.RowConsumption
var err error var err error
if candidate != nil && p.ccc != nil { if candidate != nil && p.ccc != nil {
accRows, err = p.ccc.ApplyTransactionRustTrace(candidate.RustTrace) if candidate.RustTrace != nil {
accRows, err = p.ccc.ApplyTransactionRustTrace(candidate.RustTrace)
} else {
err = errors.New("no rust trace")
}
lastTxn := candidate.Txs[candidate.Txs.Len()-1] lastTxn := candidate.Txs[candidate.Txs.Len()-1]
cccTimer.UpdateSince(cccStart) cccTimer.UpdateSince(cccStart)
if err != nil { if err != nil {