chore: backport add aztecVersion to PXE schema_tests fixture (#22960) to v4-next#22962
Closed
AztecBot wants to merge 4 commits into
Closed
chore: backport add aztecVersion to PXE schema_tests fixture (#22960) to v4-next#22962AztecBot wants to merge 4 commits into
AztecBot wants to merge 4 commits into
Conversation
Cherry-pick of 63dc224 onto backport-to-v4-next-staging. Conflicts in yarn-project/yarn.lock left as conflict markers; resolved in following commit.
v4-next still requires mkdirp@^1.0.3 (line 21033) while the new jest-file-snapshot dep introduced by #22872 brings mkdirp@^3.0.1. Kept both lockfile entries.
v4-next BlockHash class lacks the BlockHash.ZERO static introduced after the branch cut. Replaced with new BlockHash(Fr.ZERO) which is equivalent.
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
Contributor
|
Realized this backport was unnecessary because the original PR got in before Martin's PXE DB backwards compatibility PR into |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #22960 (
fix: add aztecVersion to PXE schema_tests fixture) tobackport-to-v4-next-staging.Dependency
This PR depends on #22958 (backport of #22872, which introduces the schema_tests fixture). #22960 only modifies a file added by #22872, so the cherry-pick has nothing to apply to without #22958.
This branch was based on
claudebox/backport-22872-pxe-db-schema-test(PR #22958's branch), then rebased onto currentbackport-to-v4-next-stagingHEAD (which now includes #22550 —feat: stamping aztec version into contract artifacts).After #22958 merges, this PR should be rebased so the diff collapses to just the new fixture-version commit.
Why this fix is required for the v4-next backport story
PR #22550 (which added the required
aztecVersion: stringfield onContractArtifact) merged intobackport-to-v4-next-stagingAFTER #22958 was prepared. As a result, #22958 alone no longer builds against current staging — thebuildSchemaContractArtifact()fixture is now missing a required field.The #22960 fix supplies that missing field (
aztecVersion: 'schema-fixture-version') and also updates theContractStore.jsonsnapshot accordingly. With both #22958 and this PR merged, the v4-next build is restored.Cherry-pick
Clean cherry-pick of
7ce65770b7(fix: add aztecVersion to PXE schema_tests fixture) on top of #22958's branch — onlyschema_tests.ts(1 line) and theContractStore.jsonsnapshot (2 hex blobs) changed.Original PR: #22960
ClaudeBox log: https://claudebox.work/s/895b33635fc09211?run=1
ClaudeBox log: https://claudebox.work/s/895b33635fc09211?run=1