Skip to content

chore: merge main into post-release - #595

Merged
0xisk merged 40 commits into
post-releasefrom
chore/sync-main-into-post-release
Jun 15, 2026
Merged

chore: merge main into post-release#595
0xisk merged 40 commits into
post-releasefrom
chore/sync-main-into-post-release

Conversation

@0xisk

@0xisk 0xisk commented Jun 15, 2026

Copy link
Copy Markdown
Member

Types of changes

What types of changes does your code introduce to OpenZeppelin Midnight Contracts?

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)

Maintenance / branch sync. This PR targets post-release, not main.

Merges the current main into post-release so the multisig suite can be migrated cleanly. After this lands, the post-release → main PR (#594) becomes conflict-free and mergeable while keeping Andrew's original commit history.

Why

main has advanced since post-release branched (0.1.0 / 0.2.0 releases, per-module Initializable split #562, pk→sk refactor, witness relocation #528). A direct post-release → main merge therefore conflicts in shared infra files. This PR resolves those conflicts on the post-release side.

Conflicts resolved

The multisig modules do not conflict — they import only other multisig modules plus the Compact standard library. Resolution kept main's conventions and preserved the multisig additions:

  • .gitignore, CHANGELOG.md: keep both sides' entries.
  • contracts/package.json: keep main's hierarchical build + SKIP_ZK test scripts and modern dependency versions; re-add fast-check.
  • contracts/vitest.config.ts: keep main's per-.ts 95% coverage gate.
  • contracts/src/utils/test/utils.test.ts: keep all describe blocks.
  • yarn.lock: regenerated via yarn install.

All 21 multisig .compact modules and the utils additions compile cleanly on the merged tree.

Unblocks #594.

PR Checklist

Further comments

No source behaviour changes — this is purely a merge/conflict resolution to prepare post-release for migration. Tests and docs come with the already-reviewed feature commits.

dependabot Bot and others added 30 commits May 6, 2026 16:18
@dependabot
Bump github/codeql-action from 4.35.1 to 4.35.3 (#491)
6752c92 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @0xisk
Bump step-security/harden-runner from 2.19.0 to 2.19.1 (#490)
8ead4b5 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 0xisk <iskander.andrews@openzeppelin.com>
@dependabot
Bump ora from 9.3.0 to 9.4.0 (#463)
48a6cee 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @biomejs/biome from 2.4.7 to 2.4.14 (#494)
e8e2494 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @0xisk
Bump fast-check from 4.6.0 to 4.7.0 (#493)
6d22e7c 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 0xisk <iskander.andrews@openzeppelin.com>
@dependabot
Bump @biomejs/biome from 2.4.14 to 2.4.15 (#500)
f430e23 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @0xisk
Bump @types/node from 24.10.0 to 25.6.2 (#499)
7b69c5c 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 0xisk <iskander.andrews@openzeppelin.com>
@dependabot
Bump vitest from 4.1.2 to 4.1.6 (#503)
9661def 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@andrew-fleming @0xisk
FungibleToken refactor -> replace pk with sk (#468)
19b36a7 
Signed-off-by: Andrew Fleming <fleming.andrew@protonmail.com>
Co-authored-by: 0xisk <0xisk@proton.me>
Co-authored-by: 0xisk <iskander.andrews@openzeppelin.com>
@andrew-fleming @0xisk
AccessControl: replace ownPublicKey with witness-derived id scheme (#444
83fcf82 
)

Signed-off-by: Andrew Fleming <fleming.andrew@protonmail.com>
Co-authored-by: 0xisk <0xisk@proton.me>
@andrew-fleming @0xisk
Ownable refactor -> replace pk with sk (#466)
ab79676 
Signed-off-by: Andrew Fleming <fleming.andrew@protonmail.com>
Co-authored-by: 0xisk <0xisk@proton.me>
Co-authored-by: 0xisk <iskander.andrews@openzeppelin.com>
@0xisk
refactor: gitignore (#510)
6fbde00
@andrew-fleming @0xisk
NFT refactor -> replace pk with sk (#469)
dfef3f7 
Co-authored-by: 0xisk <iskander.andrews@openzeppelin.com>
@andrew-fleming @0xisk
MultiToken refactor -> replace pk with sk (#483)
9b6b21a 
Co-authored-by: 0xisk <iskander.andrews@openzeppelin.com>
@dependabot
Bump @types/node from 25.6.2 to 25.7.0 (#509)
932a296 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump fast-check from 4.7.0 to 4.8.0 (#508)
de13830 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@andrew-fleming
Consume compact tools from NPM instead of local packages (#523)
ec44f51
@andrew-fleming
Remove cache in publish (#522)
ed68e80
@0xisk
refactor(contracts): move witnesses into per-module test/witnesses/ (#…
719f29b 
…528)
@0xisk
docs: warn that witnesses are test-only and not a published artifact (#…
78a5c61 
…529)
@0xisk
chore(test): add vitest v8 coverage with 95% perFile gate (#527)
38feca3
@0xisk
docs(readme): note npm provenance under Security (#530)
e98c14b
@0xisk
docs(audits): add audits folder with report and index (#533)
ed38a16
@0xisk
docs(token): document safe->C2C migration via CMA (#532)
4a65da9
@andrew-fleming
Bump compact tools cli to v0.0.2 (#534)
4062968
@0xisk
fix(contracts): build hierarchical .compact tree for publish (#539)
b33b4fb
@andrew-fleming
Update readme (#540)
5462978
@andrew-fleming @oz-release-app-midnight
Bump version to 0.1.0 (#541)
c014339 
Co-authored-by: oz-release-app-midnight[bot] <263459143+oz-release-app-midnight[bot]@users.noreply.github.com>
@0xisk
ci(release): install Compact compiler before build (#550)
aec45a0
@0xisk
fix(build): exclude test files from the package build (#552)
2613617
0xisk and others added 8 commits June 8, 2026 15:38
@0xisk
chore(deps): batch dependabot dependency bumps (#553)
ff0e9d8
@0xisk
ci(test): fix test-suite timeout cancellations (#554)
42fbe43
@0xisk
ci(codeql): run analysis on post-release branch (#563)
6a16f81
@andrew-fleming @coderabbitai @0xisk
Fix turbo in docs, remove global turbo install in CI and devcontainer (…
8583b71 
…#576)

Signed-off-by: Andrew Fleming <fleming.andrew@protonmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: 0xisk <0xisk@proton.me>
@0xisk
fix(security): track initialization state per module (#562)
2368403
@0xisk @oz-release-app-midnight
chore(release): v0.2.0 (#581)
78e925e 
Co-authored-by: oz-release-app-midnight[bot] <263459143+oz-release-app-midnight[bot]@users.noreply.github.com>
@0xisk
chore(deps): batch dev and CI dependency bumps (#592)
f345a88
@0xisk
chore: merge main into post-release
5a5cd19 
Sync `post-release` with the current `main` so the multisig suite can be
migrated cleanly. `main` has advanced since `post-release` branched
(0.1.0 / 0.2.0 releases, per-module `Initializable` split #562, pk->sk
refactor, witness relocation #528), leaving `post-release -> main`
conflicting in shared infra files only.

The multisig modules do not conflict: they import only other multisig
modules plus the standard library. Conflicts were limited to and
resolved in favour of main's conventions while preserving the multisig
additions:

* .gitignore, CHANGELOG.md: keep both sides' entries.
* contracts/package.json: keep main's hierarchical build, SKIP_ZK test
  scripts, and modern dep versions; re-add fast-check.
* contracts/vitest.config.ts: keep main's per-`.ts` 95% coverage gate.
* contracts/src/utils/test/utils.test.ts: keep all describe blocks.
* yarn.lock: regenerated via yarn install.

After this lands, `post-release -> main` (#594) is conflict-free. The
multisig modules and utils additions still compile cleanly.
@0xisk
0xisk requested review from a team as code owners June 15, 2026 10:36
@coderabbitai

coderabbitai Bot commented Jun 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 5df6a3cd-07ac-47a8-8eb6-70c853965afc

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch chore/sync-main-into-post-release

Comment @coderabbitai help to get the list of available commands and usage tips.

@0xisk
build: regenerate yarn.lock for fast-check
b45d185 
The merge committed main's lockfile while package.json adds
fast-check; CI's `yarn install --immutable` rejected the drift.
Regenerate so fast-check@4.8.0 and pure-rand are recorded.
@0xisk
0xisk enabled auto-merge (squash) June 15, 2026 11:29
@0xisk
fix(multisig): update simulator package import
0e1ac53 
main renamed the simulator package from
`@openzeppelin-compact/contracts-simulator` to
`@openzeppelin/compact-simulator` (#523). The multisig simulators
still used the old name, so all 11 multisig suites failed to load
(ERR_MODULE_NOT_FOUND) after merging main. The API (createSimulator,
BaseSimulatorOptions) is unchanged.
@0xisk
0xisk merged commit 79fffec into post-release Jun 15, 2026
9 checks passed
@0xisk
0xisk deleted the chore/sync-main-into-post-release branch June 15, 2026 11:54
0xisk added a commit that referenced this pull request Jun 15, 2026
@0xisk
chore: merge main into post-release to resolve #594 conflicts
4d97a7c 
PR #595 was squash-merged, so post-release carried main's file content
but not its commit ancestry. Git therefore re-derived conflicts for
#594 (post-release -> main) from the stale 2024-era merge base.

This real merge links main's history into post-release. All six
conflicts (.gitignore, CHANGELOG.md, contracts/package.json, turbo.json,
contracts/src/utils/test/utils.test.ts, yarn.lock) resolve to the
multisig-inclusive content; main's forward changes auto-merged. Net file
change is zero, so the value is purely the ancestry link that makes #594
cleanly mergeable.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pepebndc pepebndc pepebndc approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@0xisk @pepebndc @andrew-fleming