-
Notifications
You must be signed in to change notification settings - Fork 602
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(coordinator): add version check for sdk provers #1551
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,10 @@ import ( | |
|
||
// CheckScrollProverVersion check the "scroll-prover" version, if it's different from the local one, return false | ||
func CheckScrollProverVersion(proverVersion string) bool { | ||
if strings.HasPrefix(proverVersion, "sdk") { | ||
return CheckProverSDKVersion(proverVersion) | ||
} | ||
|
||
// note the version is in fact in the format of "tag-commit-scroll_prover-halo2", | ||
// so split-by-'-' length should be 4 | ||
remote := strings.Split(proverVersion, "-") | ||
|
@@ -23,8 +27,18 @@ func CheckScrollProverVersion(proverVersion string) bool { | |
return remote[2] == local[2] | ||
} | ||
|
||
// CheckProverSDKVersion check prover sdk version, it simply returns true for now, | ||
// and more checks will be added as we evolve. | ||
func CheckProverSDKVersion(proverVersion string) bool { | ||
return true | ||
} | ||
|
||
// CheckScrollRepoVersion checks if the proverVersion is at least the minimum required version. | ||
func CheckScrollRepoVersion(proverVersion, minVersion string) bool { | ||
if strings.HasPrefix(proverVersion, "sdk") { | ||
return CheckProverSDKWithMinVersion(proverVersion, minVersion) | ||
} | ||
|
||
c, err := semver.NewConstraint(">= " + minVersion + "-0") | ||
if err != nil { | ||
log.Error("failed to initialize constraint", "minVersion", minVersion, "error", err) | ||
|
@@ -39,3 +53,9 @@ func CheckScrollRepoVersion(proverVersion, minVersion string) bool { | |
|
||
return c.Check(v) | ||
} | ||
|
||
// CheckProverSDKWithMinVersion check prover sdk version is at least the minimum required version, it simply returns true for now, | ||
// and more checks will be added as we evolve. | ||
func CheckProverSDKWithMinVersion(proverVersion string, minVersion string) bool { | ||
return true | ||
} | ||
Comment on lines
+57
to
+61
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Implement basic version comparison for SDK versions. The current implementation accepts any version combination, which could lead to compatibility issues. Consider implementing basic version comparison:
Here's a suggested implementation: func CheckProverSDKWithMinVersion(proverVersion string, minVersion string) bool {
- return true
+ if !strings.HasPrefix(proverVersion, "sdk") || !strings.HasPrefix(minVersion, "sdk") {
+ log.Error("invalid SDK version format", "proverVersion", proverVersion, "minVersion", minVersion)
+ return false
+ }
+
+ // Extract version numbers (assuming format sdk-x.y.z)
+ proverParts := strings.Split(proverVersion, "-")
+ minParts := strings.Split(minVersion, "-")
+ if len(proverParts) != 2 || len(minParts) != 2 {
+ log.Error("invalid SDK version format", "proverVersion", proverVersion, "minVersion", minVersion)
+ return false
+ }
+
+ proverSemver, err1 := semver.NewVersion(proverParts[1])
+ minSemver, err2 := semver.NewVersion(minParts[1])
+ if err1 != nil || err2 != nil {
+ log.Error("invalid semver in SDK version", "error1", err1, "error2", err2)
+ return false
+ }
+
+ return proverSemver.Compare(minSemver) >= 0
}
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add validation for minVersion format in SDK version checks.
The current implementation skips semver validation for SDK versions. Consider:
📝 Committable suggestion