feat: merge-train/spartan - #24431
Merged
Merged
Conversation
Remove some stdlib dead code found manually and by Claude. A lot more left, but I'm not deleting them because they might still be useful (?). These are still present but dead - `abi/abi.ts`: `ProgramDebugInfo` - `block/in_block.ts`: `wrapDataInBlock` - `block/l2_block_info.ts`: `BlockInfoSchema`, `deserializeBlockInfo`, `randomBlockInfo`, `serializeBlockInfo` - `block/l2_block_source.ts`: `makeL2CheckpointId` - `config/sequencer-config.ts`: `DEFAULT_MAX_TXS_PER_BLOCK` - `contract/interfaces/contract_class.ts`: `ContractClassWithIdSchema` - `contract/interfaces/contract_instance_update.ts`: `ContractInstanceUpdateWithAddressSchema` - `ha-signing/local_config.ts`: `getLocalSignerConfigEnvVars` - `hash/hash.ts`: `computeNullifierMerkleHash`, `computePublicDataMerkleHash` - `interfaces/merkle_tree_operations.ts`: `FrTreeId`, `MerkleTreeLeafValue`, `inspectTree` - `interfaces/proving-job.ts`: `makeProvingRequestResult` - `kernel/private_kernel_simulated_output.ts`: `AppCircuitSimulateOutput` - `keys/derivation.ts`: `computeOvskApp` - `kv-store/config.ts`: `getDataConfigFromEnv` - `logs/app_tagging_secret.ts`: `appTaggingSecretFromString` - `logs/log_result.ts`: `LogIncludeOptionsSchema` - `logs/pre_tag.ts`: `PreTagSchema` - `noir/index.ts`: `NoirDebugMetadata`, `isNoirContractCompilationArtifacts`, `isNoirProgramCompilationArtifacts` - `slashing/types.ts`: `OffenseToBigInt`, `ProposerSlashActionType`, `ValidatorSlash`, `bigIntToOffense` - `stats/stats.ts`: `StatsEventName` - `tx/in_tx.ts`: `randomInTx` - `validators/errors.ts`: `FailedToReExecuteTransactionsError` - `validators/schemas.ts`: `ValidatorStatusHistorySchemaMap` Part of https://linear.app/aztec-labs/issue/A-1357/prepare-yarn-projectstdlib-for-repo-split
Collaborator
Author
|
🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass. |
AztecBot
enabled auto-merge
July 1, 2026 18:36
danielntmd
pushed a commit
to danielntmd/aztec-packages
that referenced
this pull request
Jul 7, 2026
…ztecProtocol#24433) ## Problem A single merge-train commit spawned **three** concurrent CI runs (observed on PR AztecProtocol#24431 for commit `b7940093a5` — three `pull_request` runs, same SHA, same second), each launching its own EC2 box with the identical name. ## Root cause Merge-train PRs are intentionally exempt from CI cancellation so each *distinct* accumulated train commit gets tested. But the concurrency group keyed on `github.run_id`: ``` group: ci3-${{ (startsWith(github.event.pull_request.head.ref, 'merge-train/') && github.run_id) || ... }} ``` `github.run_id` is unique **per run**, so `cancel-in-progress` never collapsed anything — including duplicate `pull_request` events for the *same* commit. When a sub-PR merges into `merge-train/spartan`, the bot fires a burst at one SHA: a `synchronize` plus re-applying the `ci-no-squash` and `ci-full-no-test-cache` labels (the `labeled` type is enabled). Each became its own uncancellable run. Those runs then all built the same instance name (`aztec-packages_merge-train_spartan_amd64_x-full-no-test-cache`) and raced `bootstrap_ec2`'s same-name reap (a check-then-launch race), so all three boxes survived. ## Fix - **`ci3.yml`** — key the merge-train concurrency group on `github.event.pull_request.head.sha` instead of `github.run_id`. Same-commit duplicate events now collapse (`cancel-in-progress`); distinct commits still run concurrently. Non-merge-train PRs, `merge_group`, and `push` are untouched — the changed operand is only selected when the head ref is `merge-train/*` (for everything else `startsWith(...)` is false and the expression falls through to `merge_group.head_ref || ref_name` exactly as before). - **`bootstrap_ec2`** — append the commit sha to merge-train instance names, so the distinct commits that *do* run concurrently get their own boxes instead of colliding / reaping each other. `ci.sh`'s connect helpers match the Name tag by substring, so the sha-free base name from `aws_instance_name` still resolves them. ## Verification - Merge a sub-PR into `merge-train/spartan`; confirm the `synchronize` + two `labeled` events collapse to **one** in-progress `ci3` run for that SHA and exactly one instance is requested. - Non-regression: push two commits quickly to a normal PR; the older run is cancelled, only the latest proceeds (unchanged).
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
3 participants
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.
BEGIN_COMMIT_OVERRIDE
chore(stdlib): remove dead code (#24423)
END_COMMIT_OVERRIDE