diff --git a/common/types/message/message.go b/common/types/message/message.go index 596c13f875..c7db53704a 100644 --- a/common/types/message/message.go +++ b/common/types/message/message.go @@ -10,12 +10,6 @@ import ( "github.com/scroll-tech/go-ethereum/common/hexutil" ) -const ( - EuclidV2Fork = "euclidV2" - - EuclidV2ForkNameForProver = "euclidv2" -) - // ProofType represents the type of task. type ProofType uint8 diff --git a/coordinator/cmd/api/app/mock_app.go b/coordinator/cmd/api/app/mock_app.go index e9181a34cd..28c6897d3b 100644 --- a/coordinator/cmd/api/app/mock_app.go +++ b/coordinator/cmd/api/app/mock_app.go @@ -93,7 +93,7 @@ func (c *CoordinatorApp) MockConfig(store bool) error { MinProverVersion: "v4.4.89", Verifiers: []coordinatorConfig.AssetConfig{{ AssetsPath: "", - ForkName: "euclidV2", + ForkName: "feynman", }, }}, BatchCollectionTimeSec: 60, diff --git a/coordinator/conf/config.json b/coordinator/conf/config.json index 26fb233fd8..7e07c039fd 100644 --- a/coordinator/conf/config.json +++ b/coordinator/conf/config.json @@ -8,10 +8,16 @@ "chunk_collection_time_sec": 180, "verifier": { "min_prover_version": "v4.4.45", - "verifiers": [{ - "assets_path": "assets", - "fork_name": "euclidV2" - }] + "verifiers": [ + { + "assets_path": "assets", + "fork_name": "euclidV2" + }, + { + "assets_path": "assets", + "fork_name": "feynman" + } + ] } }, "db": { diff --git a/coordinator/internal/config/config_test.go b/coordinator/internal/config/config_test.go index f6be505f6b..05c5868a56 100644 --- a/coordinator/internal/config/config_test.go +++ b/coordinator/internal/config/config_test.go @@ -23,7 +23,7 @@ func TestConfig(t *testing.T) { "min_prover_version": "v4.4.45", "verifiers": [{ "assets_path": "assets", - "fork_name": "euclidV2" + "fork_name": "feynman" }] }, "max_verifier_workers": 4 diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 370ce18eec..c34540eee7 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -293,13 +293,7 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []* taskDetail := &message.BatchTaskDetail{ ChunkInfos: chunkInfos, ChunkProofs: chunkProofs, - } - - if hardForkName == message.EuclidV2Fork { - taskDetail.ForkName = message.EuclidV2ForkNameForProver - } else { - log.Error("unsupported hard fork name", "hard_fork_name", hardForkName) - return nil, fmt.Errorf("unsupported hard fork name: %s", hardForkName) + ForkName: hardForkName, } dbBatchCodecVersion := encoding.CodecVersion(dbBatch.CodecVersion) diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index e852a7c09d..19ae5d2468 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -250,13 +250,7 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov taskDetail := message.BundleTaskDetail{ BatchProofs: batchProofs, - } - - if hardForkName == message.EuclidV2Fork { - taskDetail.ForkName = message.EuclidV2ForkNameForProver - } else { - log.Error("unsupported hard fork name", "hard_fork_name", hardForkName) - return nil, fmt.Errorf("unsupported hard fork name: %s", hardForkName) + ForkName: hardForkName, } taskDetail.BundleInfo = &message.OpenVMBundleInfo{ diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 66cc82da2f..81961185ec 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -228,13 +228,7 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove taskDetail := message.ChunkTaskDetail{ BlockHashes: blockHashes, PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash), - } - - if hardForkName == message.EuclidV2Fork { - taskDetail.ForkName = message.EuclidV2ForkNameForProver - } else { - log.Error("unsupported hard fork name", "hard_fork_name", hardForkName) - return nil, fmt.Errorf("unsupported hard fork name: %s", hardForkName) + ForkName: hardForkName, } var err error