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

feat: fix testInvalidProof test failure

Browse Source
This commit is contained in:
georgehao
2023-07-16 16:29:03 +08:00
parent 43266d2885
commit 1026d4883d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
coordinator/internal/logic/proof/proof_receiver.go
View File

@@ -126,19 +126,20 @@ func (m *ZKProofReceiver) HandleZkProof(ctx context.Context, proofMsg *message.P
// TODO: wrap both basic verifier and aggregator verifier
success, verifyErr := m.verifier.VerifyProof(proofMsg.Proof)
if verifyErr != nil || !success {
if verifyErr != nil {
// TODO: this is only a temp workaround for testnet, we should return err in real cases
log.Error("failed to verify zk proof", "proof id", proofMsg.ID, "roller pk", pk, "prove type",
proofMsg.Type, "proof time", proofTimeSec, "error", verifyErr)
}
m.proofFailure(ctx, proofMsg.ID, pk, proofMsg.Type)
// TODO: this is only a temp workaround for testnet, we should return err in real cases
log.Error("Failed to verify zk proof", "proof id", proofMsg.ID, "roller pk", pk, "prove type",
proofMsg.Type, "proof time", proofTimeSec, "error", verifyErr)
// TODO: Roller needs to be slashed if proof is invalid.
coordinatorProofsVerifiedFailedTimeTimer.Update(proofTime)
rollermanager.Manager.UpdateMetricRollerProofsVerifiedFailedTimeTimer(pk, proofTime)
log.Info("proof verified by coordinator failed", "proof id", proofMsg.ID, "roller name", "roller pk", pk,
"prove type", proofMsg.Type, "proof time", proofTimeSec, "error", verifyErr)
log.Info("proof verified by coordinator failed", "proof id", proofMsg.ID, "roller name", proverTask.ProverName,
"roller pk", pk, "prove type", proofMsg.Type, "proof time", proofTimeSec, "error", verifyErr)
return nil
}
@@ -234,7 +235,7 @@ func (m *ZKProofReceiver) updateProofStatus(ctx context.Context, hash string, pr
var proverTaskStatus types.RollerProveStatus
switch status {
case types.ProvingTaskProved, types.ProvingTaskUnassigned:
case types.ProvingTaskFailed, types.ProvingTaskUnassigned:
proverTaskStatus = types.RollerProofInvalid
case types.ProvingTaskVerified:
proverTaskStatus = types.RollerProofValid
@@ -291,7 +292,7 @@ func (m *ZKProofReceiver) checkIsTaskSuccess(ctx context.Context, hash string, p
return false
}
}
if provingStatus == types.ProvingTaskVerified || provingStatus == types.ProvingTaskProved {
if provingStatus == types.ProvingTaskVerified {
return true
}
return false