mirror of
https://github.com/scroll-tech/scroll.git
synced 2026-01-14 00:18:03 -05:00
Compare commits
1 Commits
test/code
...
v4.4.26-de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
79f86c879e |
@@ -3,6 +3,7 @@ package provertask
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
"time"
|
"time"
|
||||||
@@ -190,7 +191,7 @@ func (bp *BatchProverTask) doAssignTaskWithinChunkRange(ctx *gin.Context, taskCt
|
|||||||
func (bp *BatchProverTask) getChunkRangeByName(ctx *gin.Context, hardForkName string) (*chunkIndexRange, error) {
|
func (bp *BatchProverTask) getChunkRangeByName(ctx *gin.Context, hardForkName string) (*chunkIndexRange, error) {
|
||||||
hardForkNumber, err := bp.getHardForkNumberByName(hardForkName)
|
hardForkNumber, err := bp.getHardForkNumberByName(hardForkName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("batch assign failure because of the hard fork name don't exist", "fork name", hardForkName)
|
// log.Error("batch assign failure because of the hard fork name don't exist", "fork name", hardForkName)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -246,10 +247,7 @@ func (bp *BatchProverTask) assignWithTwoCircuits(ctx *gin.Context, taskCtx *prov
|
|||||||
for i := 0; i < 2; i++ {
|
for i := 0; i < 2; i++ {
|
||||||
hardForkNames[i] = bp.reverseVkMap[getTaskParameter.VKs[i]]
|
hardForkNames[i] = bp.reverseVkMap[getTaskParameter.VKs[i]]
|
||||||
chunkRanges[i], err = bp.getChunkRangeByName(ctx, hardForkNames[i])
|
chunkRanges[i], err = bp.getChunkRangeByName(ctx, hardForkNames[i])
|
||||||
if err != nil {
|
if err == nil && chunkRanges[i] != nil {
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if chunkRanges[i] != nil {
|
|
||||||
if chunkRange == nil {
|
if chunkRange == nil {
|
||||||
chunkRange = chunkRanges[i]
|
chunkRange = chunkRanges[i]
|
||||||
} else {
|
} else {
|
||||||
@@ -258,7 +256,8 @@ func (bp *BatchProverTask) assignWithTwoCircuits(ctx *gin.Context, taskCtx *prov
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if chunkRange == nil {
|
if chunkRange == nil {
|
||||||
return nil, nil
|
log.Error("chunkRange empty")
|
||||||
|
return nil, errors.New("chunkRange empty")
|
||||||
}
|
}
|
||||||
var hardForkName string
|
var hardForkName string
|
||||||
getHardForkName := func(batch *orm.Batch) (string, error) {
|
getHardForkName := func(batch *orm.Batch) (string, error) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package provertask
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -181,21 +182,31 @@ func (cp *ChunkProverTask) assignWithTwoCircuits(ctx *gin.Context, taskCtx *prov
|
|||||||
blockRanges [2]*blockRange
|
blockRanges [2]*blockRange
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
|
var blockRange *blockRange
|
||||||
for i := 0; i < 2; i++ {
|
for i := 0; i < 2; i++ {
|
||||||
hardForkNames[i] = cp.reverseVkMap[getTaskParameter.VKs[i]]
|
hardForkNames[i] = cp.reverseVkMap[getTaskParameter.VKs[i]]
|
||||||
blockRanges[i], err = cp.getBlockRangeByName(hardForkNames[i])
|
blockRanges[i], err = cp.getBlockRangeByName(hardForkNames[i])
|
||||||
if err != nil {
|
if err == nil && blockRanges[i] != nil {
|
||||||
return nil, err
|
if blockRange == nil {
|
||||||
|
blockRange = blockRanges[i]
|
||||||
|
} else {
|
||||||
|
var err2 error
|
||||||
|
blockRange, err2 = blockRange.merge(*blockRanges[i])
|
||||||
|
if err2 != nil {
|
||||||
|
return nil, err2
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
blockRange, err := blockRanges[0].merge(*blockRanges[1])
|
if blockRange == nil {
|
||||||
if err != nil {
|
log.Error("blockRange empty")
|
||||||
return nil, err
|
return nil, errors.New("blockRange empty")
|
||||||
}
|
}
|
||||||
|
|
||||||
var hardForkName string
|
var hardForkName string
|
||||||
getHardForkName := func(chunk *orm.Chunk) (string, error) {
|
getHardForkName := func(chunk *orm.Chunk) (string, error) {
|
||||||
for i := 0; i < 2; i++ {
|
for i := 0; i < 2; i++ {
|
||||||
if blockRanges[i].contains(chunk.StartBlockNumber, chunk.EndBlockNumber) {
|
if blockRanges[i] != nil && blockRanges[i].contains(chunk.StartBlockNumber, chunk.EndBlockNumber) {
|
||||||
hardForkName = hardForkNames[i]
|
hardForkName = hardForkNames[i]
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -235,7 +246,7 @@ func (r *blockRange) contains(start, end uint64) bool {
|
|||||||
func (cp *ChunkProverTask) getBlockRangeByName(hardForkName string) (*blockRange, error) {
|
func (cp *ChunkProverTask) getBlockRangeByName(hardForkName string) (*blockRange, error) {
|
||||||
hardForkNumber, err := cp.getHardForkNumberByName(hardForkName)
|
hardForkNumber, err := cp.getHardForkNumberByName(hardForkName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("chunk assign failure because of the hard fork name don't exist", "fork name", hardForkName)
|
// log.Error("chunk assign failure because of the hard fork name don't exist", "fork name", hardForkName)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user