diff --git a/common/version/version.go b/common/version/version.go index d31cceb4b7..d5edafe7f3 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.4.20" +var tag = "v4.4.21" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index f2b3962f3f..f23d79d081 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -242,17 +242,24 @@ func (bp *BatchProverTask) assignWithTwoCircuits(ctx *gin.Context, taskCtx *prov chunkRanges [2]*chunkIndexRange err error ) + var chunkRange *chunkIndexRange for i := 0; i < 2; i++ { hardForkNames[i] = bp.reverseVkMap[getTaskParameter.VKs[i]] chunkRanges[i], err = bp.getChunkRangeByName(ctx, hardForkNames[i]) if err != nil { return nil, err } - if chunkRanges[i] == nil { - return nil, nil + if chunkRanges[i] != nil { + if chunkRange == nil { + chunkRange = chunkRanges[i] + } else { + chunkRange = chunkRange.merge(*chunkRanges[i]) + } } } - chunkRange := chunkRanges[0].merge(*chunkRanges[1]) + if chunkRange == nil { + return nil, nil + } var hardForkName string getHardForkName := func(batch *orm.Batch) (string, error) { for i := 0; i < 2; i++ {