Skip to content

Commit 1e85070

Browse files
committed
Keep failure type in close task
1 parent 055f76e commit 1e85070

File tree

7 files changed

+213
-1
lines changed

7 files changed

+213
-1
lines changed

coordinator/internal/logic/submitproof/proof_receiver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ func (m *ProofReceiverLogic) closeProofTask(ctx context.Context, proverTask *orm
400400
log.Info("proof close task update proof status", "hash", proverTask.TaskID, "proverPublicKey", proverTask.ProverPublicKey,
401401
"taskType", message.ProofType(proverTask.TaskType).String(), "status", types.ProvingTaskVerified.String())
402402

403-
if err := m.updateProofStatus(ctx, proverTask, proofParameter, types.ProverProofValid, types.ProverTaskFailureTypeUndefined, proofTimeSec); err != nil {
403+
if err := m.updateProofStatus(ctx, proverTask, proofParameter, types.ProverProofValid, types.ProverTaskFailureType(proverTask.FailureType), proofTimeSec); err != nil {
404404
log.Error("failed to updated proof status ProvingTaskVerified", "hash", proverTask.TaskID, "proverPublicKey", proverTask.ProverPublicKey, "error", err)
405405
return err
406406
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
BEGIN_BLOCK?=25950000
2+
END_BLOCK?=25950012
3+
SCROLL_FORK_NAME=feynman
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"db_config": {
3+
"driver_name": "postgres",
4+
"dsn": "postgres://dev:dev@localhost:5432/scroll?sslmode=disable",
5+
"maxOpenNum": 5,
6+
"maxIdleNum": 1
7+
},
8+
"fetch_config": {
9+
"endpoint": "https://mainnet-rpc.scroll.io",
10+
"l2_message_queue_address": "0x5300000000000000000000000000000000000000"
11+
},
12+
"validium_mode": false,
13+
"codec_version": 8
14+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"prover_manager": {
3+
"provers_per_session": 1,
4+
"session_attempts": 5,
5+
"external_prover_threshold": 32,
6+
"bundle_collection_time_sec": 180,
7+
"batch_collection_time_sec": 180,
8+
"chunk_collection_time_sec": 180,
9+
"verifier": {
10+
"min_prover_version": "v4.4.33",
11+
"verifiers": [
12+
{
13+
"features": "legacy_witness:openvm_13",
14+
"assets_path": "assets_feynman",
15+
"fork_name": "feynman"
16+
}
17+
]
18+
}
19+
},
20+
"db": {
21+
"driver_name": "postgres",
22+
"dsn": "postgres://dev:dev@localhost/scroll?sslmode=disable",
23+
"maxOpenNum": 200,
24+
"maxIdleNum": 20
25+
},
26+
"l2": {
27+
"validium_mode": false,
28+
"chain_id": 534352,
29+
"l2geth": {
30+
"endpoint": "<serach a public rpc endpoint like alchemy>"
31+
}
32+
},
33+
"auth": {
34+
"secret": "prover secret key",
35+
"challenge_expire_duration_sec": 3600,
36+
"login_expire_duration_sec": 3600
37+
},
38+
"sequencer": {
39+
"decryption_key": "not need"
40+
}
41+
}

tests/prover-e2e/mainnet-feynman/genesis.json

Lines changed: 109 additions & 0 deletions
Large diffs are not rendered by default.

zkvm-prover/config_remote.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"sdk_config": {
3+
"prover_name_prefix": "test-prover",
4+
"keys_dir": ".work",
5+
"coordinator": {
6+
"base_url": "https://coordinator.scroll.io",
7+
"retry_count": 10,
8+
"retry_wait_time_sec": 10,
9+
"connection_timeout_sec": 1800
10+
},
11+
"prover": {
12+
"supported_proof_types": [
13+
1,2,3
14+
],
15+
"circuit_version": "v0.13.1"
16+
},
17+
"health_listener_addr": "127.0.0.1:10080"
18+
},
19+
"circuits": {
20+
"feynman": {
21+
"hard_fork_name": "feynman",
22+
"workspace_path": ".work/feynman",
23+
"base_url": "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/feynman/"
24+
},
25+
"galileo": {
26+
"hard_fork_name": "galileo",
27+
"base_url": "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/galileov2/",
28+
"asset_detours": {
29+
"ccc571171bc204071573675bc048f43513ece7671474b7691b12061b44bf37556618ea25a7991845bbc5fd571670ee47379ba31ace92d345bca59702a0d4112d": "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/v0.7.0/chunk/",
30+
"a150d62e1cab9659b2a3b966c2f49655d36e40695b5fbf1c25eebd5020979948f2be2f4468d1ac4a70e7682babb1c60417e21c7633d4b55b58f44703ec82b05a": "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/v0.7.0/batch/",
31+
"4eb5e2372539235db88ffe305f032164b2be5f26439e5262c29ecd0a968e1f0f22c0e5294bcb1b3a9def836f8d0f18612a9860629b9497292976ca11844b7e73": "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/v0.7.0/bundle/"
32+
},
33+
"workspace_path": ".work/galileo"
34+
}
35+
}
36+
}

zkvm-prover/target.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"chunks": [
3+
"0xcc092080e137439c8c424651a6de99b3ff7954d6c3223d5dc4c4f8d2ca9e5a98"
4+
],
5+
"batches": [
6+
],
7+
"bundles": [
8+
]
9+
}

0 commit comments

Comments
 (0)