From 9adc2bfd1a0f8e36a310f0463df38c09b8efdcee Mon Sep 17 00:00:00 2001 From: georgehao Date: Tue, 1 Jul 2025 11:49:00 +0800 Subject: [PATCH 1/4] remove unused check --- coordinator/cmd/api/app/mock_app.go | 2 +- coordinator/conf/config.json | 14 ++++++++++---- coordinator/internal/config/config_test.go | 2 +- .../internal/logic/provertask/batch_prover_task.go | 7 ------- .../logic/provertask/bundle_prover_task.go | 7 ------- .../internal/logic/provertask/chunk_prover_task.go | 7 ------- 6 files changed, 12 insertions(+), 27 deletions(-) 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..369f681f02 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..bc9700d6a1 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -295,13 +295,6 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, 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) - } - dbBatchCodecVersion := encoding.CodecVersion(dbBatch.CodecVersion) switch dbBatchCodecVersion { case encoding.CodecV3, encoding.CodecV4, encoding.CodecV6, encoding.CodecV7, encoding.CodecV8: diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index e852a7c09d..1ad2faa495 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -252,13 +252,6 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov 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) - } - taskDetail.BundleInfo = &message.OpenVMBundleInfo{ ChainID: bp.cfg.L2.ChainID, PrevStateRoot: common.HexToHash(parentBatch.StateRoot), diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 66cc82da2f..94d0df63d4 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -230,13 +230,6 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove 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) - } - var err error taskDetailBytes, err = json.Marshal(taskDetail) if err != nil { From 64b3db712dcc8ed6e1331df88e3a5c4553749259 Mon Sep 17 00:00:00 2001 From: georgehao Date: Tue, 1 Jul 2025 11:50:35 +0800 Subject: [PATCH 2/4] update --- common/types/message/message.go | 6 ------ 1 file changed, 6 deletions(-) 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 From 9df005ed31ac32a8393523edc496619f1f5ed560 Mon Sep 17 00:00:00 2001 From: georgehao Date: Tue, 1 Jul 2025 14:18:46 +0800 Subject: [PATCH 3/4] update --- coordinator/internal/logic/provertask/batch_prover_task.go | 1 + coordinator/internal/logic/provertask/bundle_prover_task.go | 1 + coordinator/internal/logic/provertask/chunk_prover_task.go | 1 + 3 files changed, 3 insertions(+) diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index bc9700d6a1..c34540eee7 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -293,6 +293,7 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []* taskDetail := &message.BatchTaskDetail{ ChunkInfos: chunkInfos, ChunkProofs: chunkProofs, + 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 1ad2faa495..19ae5d2468 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -250,6 +250,7 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov taskDetail := message.BundleTaskDetail{ BatchProofs: batchProofs, + 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 94d0df63d4..81961185ec 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -228,6 +228,7 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove taskDetail := message.ChunkTaskDetail{ BlockHashes: blockHashes, PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash), + ForkName: hardForkName, } var err error From 21c0c9bac133f9165e9d343a8014b22ea808b042 Mon Sep 17 00:00:00 2001 From: georgehao Date: Tue, 1 Jul 2025 19:02:39 +0800 Subject: [PATCH 4/4] fix unit test --- coordinator/internal/config/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coordinator/internal/config/config_test.go b/coordinator/internal/config/config_test.go index 369f681f02..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": "feynman", + "fork_name": "feynman" }] }, "max_verifier_workers": 4