Skip to content

check-prestate: handle go module pseudo-versions and fix kona prestate name #18691

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.

Sign up for GitHub

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

Merged
ajsutton merged 2 commits into from
Jan 4, 2026
Merged

check-prestate: handle go module pseudo-versions and fix kona prestate name #18691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d07b2d
check-prestate: handle go module pseudo-versions
pauldowman Dec 23, 2025
3e8288f
check-prestate: fix default kona prestate type
pauldowman Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion op-chain-ops/cmd/check-prestate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func main() {
switch prestateType {
case "cannon32", "cannon64", "interop":
prestateImpl = prestate.NewOPProgramPrestate()
case "cannon-kona":
case "cannon64-kona":
prestateImpl = prestate.NewKonaPrestate()
default:
log.Crit("Invalid prestate type", "type", prestateType)
Expand Down
21 changes: 18 additions & 3 deletions op-chain-ops/cmd/check-prestate/prestate/opprogram.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/superchain"
"golang.org/x/mod/modfile"
"golang.org/x/mod/module"
)

const (
monorepoGoModAtTag = "https://github.com/ethereum-optimism/optimism/raw/refs/tags/%s/go.mod"
superchainRegistryCommitAtRef = "https://github.com/ethereum-optimism/op-geth/raw/%s/superchain-registry-commit.txt"
superchainConfigsZipAtTag = "https://github.com/ethereum-optimism/op-geth/raw/refs/tags/%s/superchain/superchain-configs.zip"
superchainConfigsZipAtRef = "https://github.com/ethereum-optimism/op-geth/raw/%s/superchain/superchain-configs.zip"
)

type OPProgramPrestate struct {
Expand All @@ -38,7 +39,7 @@ func (p *OPProgramPrestate) FindVersions(log log.Logger, prestateVersion string)
if err != nil {
log.Crit("Failed to fetch go mod", "err", err)
}
elVersion := p.findOpGethVersion(log, modFile)
elVersion := resolvePseudoVersion(p.findOpGethVersion(log, modFile))
elCommitInfo = types.NewCommitInfo("ethereum-optimism", "op-geth", elVersion, "optimism", "")

registryCommitBytes, err := util.Fetch(fmt.Sprintf(superchainRegistryCommitAtRef, elVersion))
Expand All @@ -48,7 +49,7 @@ func (p *OPProgramPrestate) FindVersions(log log.Logger, prestateVersion string)
superChainRegistryCommit = strings.TrimSpace(string(registryCommitBytes))
log.Info("Found superchain registry commit info", "commit", superChainRegistryCommit)

prestateConfigData, err := util.Fetch(fmt.Sprintf(superchainConfigsZipAtTag, elVersion))
prestateConfigData, err := util.Fetch(fmt.Sprintf(superchainConfigsZipAtRef, elVersion))
if err != nil {
log.Crit("Failed to fetch prestate's superchain registry config zip", "err", err)
}
Expand Down Expand Up @@ -84,3 +85,17 @@ func fetchMonorepoGoMod(opProgramTag string) (*modfile.File, error) {

return modfile.Parse("go.mod", goMod, nil)
}

// resolvePseudoVersion converts a Go module version to a git ref.
// For pseudo-versions like "v1.101604.0-synctest.0.0.20251208094937-ba6bdcfef423",
// it extracts the commit hash suffix. For regular tags, it returns the version as-is.
func resolvePseudoVersion(version string) string {
if module.IsPseudoVersion(version) {
rev, err := module.PseudoVersionRev(version)
if err != nil {
log.Crit("Failed to extract commit hash from pseudo-version", "version", version, "err", err)
}
return rev
}
return version
}