fix: upgrade scroll-prover to v0.5.18 to fix git version issue (#804 )

feat(types): add git_version to both chunk and batch proofs (#801 )
ci(github): simplify bump_version workflow (#802 )
2026-01-12 07:28:08 -05:00 · 2023-08-16 16:07:05 +08:00 · 2023-08-16 14:37:03 +08:00 · 2023-08-16 13:36:43 +08:00 · 2023-08-16 13:25:26 +08:00
9 changed files with 26 additions and 28 deletions
--- a/.github/workflows/bump_version.yml
+++ b/.github/workflows/bump_version.yml
@@ -10,15 +10,13 @@ on:
      - ready_for_review

 jobs:
-  check:
+  try-to-bump:
    runs-on: ubuntu-latest
-    outputs:
-      check-result: ${{ steps.check-diff.outputs.result }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
      - name: check diff
-        id: check-diff
+        id: check_diff
        run: |
          set -euo pipefail

@@ -43,19 +41,15 @@ jobs:
            echo '> yes'
            echo "result=bump" >> "$GITHUB_OUTPUT"
          fi
-  bump:
-    runs-on: ubuntu-latest
-    needs: check
-    if: needs.check.outputs.check-result == 'bump'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
      - name: Install Node.js 16
+        if: steps.check_diff.outputs.result == 'bump'
        uses: actions/setup-node@v3
        with:
          node-version: 16
      - name: bump version in common/version/version.go
+        if: steps.check_diff.outputs.result == 'bump'
        run: node .github/scripts/bump_version_dot_go.mjs
      - uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
+        if: steps.check_diff.outputs.result == 'bump'
        with:
          commit_message: "chore: auto version bump [bot]"
--- a/common/libzkp/impl/Cargo.lock
+++ b/common/libzkp/impl/Cargo.lock
@@ -2755,7 +2755,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.16#bd901762c4744936586f4a30e27a4b65cea3bb71"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.18#fcf4bf3137ad37becdeb5360b23ac978405c6b2c"
 dependencies = [
 "aggregator",
 "anyhow",
@@ -4040,7 +4040,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.16#bd901762c4744936586f4a30e27a4b65cea3bb71"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.18#fcf4bf3137ad37becdeb5360b23ac978405c6b2c"
 dependencies = [
 "base64 0.13.1",
 "blake2",
--- a/common/libzkp/impl/Cargo.toml
+++ b/common/libzkp/impl/Cargo.toml
@@ -20,8 +20,8 @@ maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-
 halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" }

 [dependencies]
-prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.16" }
-types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.16" }
+prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.18" }
+types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.18" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }

 log = "0.4"
--- a/common/types/message/message.go
+++ b/common/types/message/message.go
@@ -250,12 +250,14 @@ type ChunkInfo struct {

 // ChunkProof includes the proof info that are required for chunk verification and rollup.
 type ChunkProof struct {
-	StorageTrace []byte     `json:"storage_trace"`
-	Protocol     []byte     `json:"protocol"`
-	Proof        []byte     `json:"proof"`
-	Instances    []byte     `json:"instances"`
-	Vk           []byte     `json:"vk"`
-	ChunkInfo    *ChunkInfo `json:"chunk_info,omitempty"` // cross-reference between cooridinator computation and prover compution
+	StorageTrace []byte `json:"storage_trace"`
+	Protocol     []byte `json:"protocol"`
+	Proof        []byte `json:"proof"`
+	Instances    []byte `json:"instances"`
+	Vk           []byte `json:"vk"`
+	// cross-reference between cooridinator computation and prover compution
+	ChunkInfo  *ChunkInfo `json:"chunk_info,omitempty"`
+	GitVersion string     `json:"git_version,omitempty"`
 }

 // BatchProof includes the proof info that are required for batch verification and rollup.
@@ -263,6 +265,8 @@ type BatchProof struct {
 	Proof     []byte `json:"proof"`
 	Instances []byte `json:"instances"`
 	Vk        []byte `json:"vk"`
+	// cross-reference between cooridinator computation and prover compution
+	GitVersion string `json:"git_version,omitempty"`
 }

 // SanityCheck checks whether an BatchProof is in a legal format
--- a/common/types/message/message_test.go
+++ b/common/types/message/message_test.go
@@ -108,7 +108,7 @@ func TestProofDetailHash(t *testing.T) {
 	}
 	hash, err := proofDetail.Hash()
 	assert.NoError(t, err)
-	expectedHash := "72a00232c1fcb100b1b67e6d12cd449e5d2d890e3a66e50f4c23499d4990766f"
+	expectedHash := "d3b57cb84b0da8043373eeb3612806fb7248d6d1b6e089846ccf3ccce2d9f31c"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }

--- a/common/version/version.go
+++ b/common/version/version.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 )

-var tag = "v4.1.49"
+var tag = "v4.1.53"

 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
--- a/coordinator/internal/orm/prover_task.go
+++ b/coordinator/internal/orm/prover_task.go
@@ -166,8 +166,8 @@ func (o *ProverTask) SetProverTask(ctx context.Context, proverTask *ProverTask,

 	db = db.Model(&ProverTask{})
 	db = db.Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "task_type"}, {Name: "task_id"}, {Name: "prover_public_key"}},
-		DoUpdates: clause.AssignmentColumns([]string{"prover_version", "proving_status", "failure_type", "assigned_at"}),
+		Columns:   []clause.Column{{Name: "task_type"}, {Name: "task_id"}, {Name: "prover_public_key"}, {Name: "prover_version"}},
+		DoUpdates: clause.AssignmentColumns([]string{"proving_status", "failure_type", "assigned_at"}),
 	})

 	if err := db.Create(&proverTask).Error; err != nil {
--- a/database/migrate/migrations/00006_prover_task.sql
+++ b/database/migrate/migrations/00006_prover_task.sql
@@ -26,7 +26,7 @@ create table prover_task
    updated_at          TIMESTAMP(0)   NOT NULL DEFAULT CURRENT_TIMESTAMP,
    deleted_at          TIMESTAMP(0)   DEFAULT NULL,

-    CONSTRAINT uk_tasktype_taskid_publickey UNIQUE (task_type, task_id, prover_public_key)
+    CONSTRAINT uk_tasktype_taskid_publickey_version UNIQUE (task_type, task_id, prover_public_key, prover_version)
 );

 comment
--- a/prover-stats-api/internal/orm/prover_task.go
+++ b/prover-stats-api/internal/orm/prover_task.go
@@ -94,8 +94,8 @@ func (o *ProverTask) SetProverTask(ctx context.Context, proverTask *ProverTask,

 	db = db.Model(&ProverTask{})
 	db = db.Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "task_type"}, {Name: "task_id"}, {Name: "prover_public_key"}},
-		DoUpdates: clause.AssignmentColumns([]string{"prover_version", "proving_status", "failure_type", "assigned_at"}),
+		Columns:   []clause.Column{{Name: "task_type"}, {Name: "task_id"}, {Name: "prover_public_key"}, {Name: "prover_version"}},
+		DoUpdates: clause.AssignmentColumns([]string{"proving_status", "failure_type", "assigned_at"}),
 	})

 	if err := db.Create(&proverTask).Error; err != nil {
Author	SHA1	Message	Date
Steven	8e8a9c0351	fix: upgrade scroll-prover to `v0.5.18` to fix git version issue (#804 )	2023-08-16 16:07:05 +08:00
Steven	974930f051	feat(types): add `git_version` to both chunk and batch proofs (#801 )	2023-08-16 14:37:03 +08:00
HAOYUatHZ	9654d76356	ci(github): simplify bump_version workflow (#802 ) Co-authored-by: HAOYUatHZ <HAOYUatHZ@users.noreply.github.com>	2023-08-16 13:36:43 +08:00
HAOYUatHZ	373e98ff3c	fix(db): don't overwrite prover_task's prover_version (#797 ) Co-authored-by: HAOYUatHZ <HAOYUatHZ@users.noreply.github.com>	2023-08-16 13:25:26 +08:00