From 7e07363cde42f46681cf9e32db54312277a66108 Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Fri, 13 Nov 2026 16:56:18 +0000 Subject: [PATCH 1/2] feat(research): prove sharp binomial source floors --- research/binomial-source-floor/PROOF.md | 156 ++++++++++++++++ research/binomial-source-floor/README.md | 134 +++++++++++++ research/binomial-source-floor/SOURCES.json | 30 +++ research/binomial-source-floor/TASK.json | 119 ++++++++++++ research/binomial-source-floor/VERIFY.json | 35 ++++ research/binomial-source-floor/floor.py | 39 ++++ research/binomial-source-floor/verify.py | 197 ++++++++++++++++++++ 7 files changed, 710 insertions(+) create mode 100644 research/binomial-source-floor/PROOF.md create mode 100644 research/binomial-source-floor/README.md create mode 100644 research/binomial-source-floor/SOURCES.json create mode 100644 research/binomial-source-floor/TASK.json create mode 100644 research/binomial-source-floor/VERIFY.json create mode 100644 research/binomial-source-floor/floor.py create mode 100644 research/binomial-source-floor/verify.py diff --git a/research/binomial-source-floor/PROOF.md b/research/binomial-source-floor/PROOF.md new file mode 100644 index 0000000000..eb69d8150b --- /dev/null +++ b/research/binomial-source-floor/PROOF.md @@ -0,0 +1,156 @@ +# Sharp source floor from five inventory summaries + +This is a scoped written proof, produced by Nick Petalas. Apache-2.0. +It uses Ali Romman's all-height source telescope from +[PR #5318](https://github.com/CrocSwap/integer-mult-bounds/pull/5318) as a +premise. The binomial counting identity and monotone comparison are elementary; +no literature-wide priority for those methods is claimed. + +## Contract and credited premise + +Treat each productive or paid position as a separate token, including repeated +ranks. Let productive ranks have exact minimum L and maximum M, with +2 <= L < M. There are W productive tokens, exactly t of rank M, where +1 <= t < W. There are Q paid tokens, each with positive integer rank below L. +Assume Q >= W. For an integer cap c >= 1, let g be the unique nonnegative +integer satisfying L^g <= c < L^(g+1). + +For d in 0,...,g, let F_d(c) count words consisting of d ordered paid tokens +and g-d ordered productive tokens whose rank product is at most c. +The paid and productive positions are distinguished. There is no factor +binomial(g,d) choosing their interleaving. The chronological source model +and its Pascal matching are exactly those of the credited predecessor. + +Write D_d(c) = Q^d W^(g-d) - F_d(c). The predecessor proves + +```text +S(c) = W^(g+1) + (Q-W) sum_(d=0,...,g-1) D_d(c). (1) +``` + +This note neither replays that package nor claims a new source census. +The new question is the sharp lower envelope of (1) with only +L, M, W, Q, t fixed. + +## Pointwise theorem + +Define + +```text +B_d(c) = Q^d sum_(k=0,...,g-d) + binomial(g-d,k) t^k (W-t)^(g-d-k) + [L^(g-d-k) M^k > c]. + +E(c) = W^(g+1) + (Q-W) sum_(d=0,...,g-1) B_d(c). (2) +``` + +Square brackets denote an indicator. Then S(c) >= E(c). Moreover E(c) +is the exact minimum of S(c) over all inventories with these five summaries. +The empty sum gives E(c)=W when g=0. + +To prove the inequality, preserve token identities and replace every +nonmaximum productive rank by L and every paid rank by 1. Preserve all t +maximum-rank tokens at M. Every word's rank product weakly decreases. +Consequently each word still above c after replacement was above c before +replacement, so D_d(c) >= B_d(c). + +For the replaced word, choosing its k maximum-rank productive positions +and their identities gives precisely the summand in (2). All Q^d paid +token words have the same replaced rank 1, but remain distinct words. +Multiplying by the nonnegative Q-W in (1) proves the inequality. + +The replaced inventory itself has the required exact minimum, maximum, +counts and separation. Its productive histogram is +{L: W-t, M: t}; its paid histogram is {1: Q}. Every preceding inequality +is equality for that inventory, proving sharpness. This is sharpness over +the summary-data class, not attainment by a native or physical compiler. + +The sign condition matters. For example, take L=2, M=4, W=3, t=1, Q=1 +and c=4. The collapsed inventory has 17 sources, whereas productive ranks +(2,3,4) and the same single rank-one paid token have 11. Thus (2) is not +a lower bound if Q= L^(g+1). (3) +``` + +The distinction between >c and >=L^(g+1) is the integer boundary, not +a relaxation. In particular, rank product equal to c is eligible and +must not be charged as a deficit. + +## Power-1024 application + +The following are cited source facts from PR #5318 and the retained +[#4470 invoice](../joint-helper-lattice/RESULT.json), not results +reverified here. Under that unchanged historical product, completion and +split rule, + +```text +v = 1024, +L = 21^v, M = 145^v, W = 10928^v, t = 224^v, +Q >= Q0 = 64620^v > W, and every paid rank is below L. +``` + +Exactly t maximum-rank tokens remain because a product of v productive +ranks equals 145^v precisely when every factor is one of the 224 rank-145 +tokens. The completion floor is below this maximum. The inherited lower +bound Q>=Q0 includes the fact that each raw paid call yields at least one +positive split call; completion may add more. + +The exact small integer comparisons are + +```text +21 < 145 < 21^2, 145^2 > 21^3. +``` + +At g=1 and the slab's upper cap, even M is eligible, so the best uniform +summary-data floor remains W^2. At g=2, exactly the pair of maximum-rank +productive tokens is ineligible in the collapsed depth-zero word. A word +with only one maximum has product L M < L^3. At depth one, even M < L^3 +is eligible. Equations (2) and (3) therefore give the exact summary minimum + +```text +min_(L^2 <= c < L^3) S(c) = W^3 + (Q-W)t^2. (4) +``` + +The minimum in (4) ranges over inventories with the declared summaries +as well as caps. For the actual historical inventory it is a lower bound, +not an asserted exact source count. Substituting Q>=Q0 gives the new +explicit correction + +```text +S(c) >= 10928^(3072) + + (64620^1024 - 10928^1024) * 224^2048 + > W^3. +``` + +More generally, for every g>=2 and every cap in its height slab, any +depth-zero word with at least two maximum-rank tokens is ineligible: +L^(g-k)M^k >= L^(g-2)M^2 > L^(g+1) > c for k>=2. +Counting just these words in (1) proves + +```text +S(c) >= W^(g+1) + (Q0-W) + * (W^g - (W-t)^g - g*t*(W-t)^(g-1)) + > W^(g+1). (5) +``` + +Equation (2) can be stronger because it retains other depths and threshold +terms. Formula (5) is a simple explicit correction valid throughout every +height slab g>=2 of the actual power-1024 model. The all-height quantifier +is proved above; the executable does not enumerate its enormous heights. + +## Scope + +This improves a mathematical source-count lower bound for an unchanged +historical nested compiler. It supplies neither a higher accumulated K/N +coefficient nor a smaller compiler width. The selected #7000 construction, +kappa, physical stock, routing, ownership, native realization, precision/tape, +all-size admission and analytic recovery are unchanged. No complete +multiplication theorem or independent human or proof-kernel review is claimed. diff --git a/research/binomial-source-floor/README.md b/research/binomial-source-floor/README.md new file mode 100644 index 0000000000..fb4005563b --- /dev/null +++ b/research/binomial-source-floor/README.md @@ -0,0 +1,134 @@ +# Sharp binomial source floors for separated inventories + +Scoped written proof with exact finite corroboration, produced by Nick Petalas. +No new kappa. Apache-2.0. + +The all-height floor `S(c) >= W^(g+1)` from Ali Romman's +[PR #5318](https://github.com/CrocSwap/integer-mult-bounds/pull/5318) now has +a sharp summary-data refinement. Fix the productive minimum L, maximum M, +maximum-rank multiplicity t, productive count W and paid count Q>=W, with +all positive paid ranks below L. The exact minimum source count among those +inventories is a finite binomial-tail expression, attained by productive +ranks `{L:W-t,M:t}` and paid ranks `{1:Q}`. + +For `L^g <= c < L^(g+1)`, the new floor is + +```text +W^(g+1) + (Q-W) sum_(d=0,...,g-1) Q^d + * sum_(k=0,...,g-d) binomial(g-d,k) t^k (W-t)^(g-d-k) + [L^(g-d-k) M^k > c]. +``` + +[PROOF.md](PROOF.md) gives the tokenwise comparison and sharpness proof. +The entire height slab has its sharp uniform floor at `c=L^(g+1)-1`. +This is an exact extremal result for an abstract inventory class, not an +exact count or an attaining implementation for a selected supplier. + +For the unchanged historical #4470 rule at product power 1024, the new +first strict uniform correction occurs at height two: + +```text +L=21^1024, M=145^1024, W=10928^1024, t=224^1024, +Q >= Q0=64620^1024, + +S(c) >= W^3 + (Q0-W)t^2 > W^3 when L^2 <= c < L^3. +``` + +For every larger height g>=2, a simple uniform correction is + +```text +S(c) >= W^(g+1) + (Q0-W) + * (W^g - (W-t)^g - g*t*(W-t)^(g-1)) > W^(g+1). +``` + +This quantifies part of #5318's explicitly open top-slab deficit question +at the actual product power. The correction is small. No improved accumulated +K/N coefficient, reduced compiler width or physical saving is claimed. +The selected #7000 frontier remains unchanged. + +## Evidence and reproduction + +From the repository root, using CPython 3.12 and the standard library: + +```sh +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -W error -B research/binomial-source-floor/verify.py +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -O -W error -B research/binomial-source-floor/verify.py +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -B scripts/research_package.py --package research/binomial-source-floor +/Users/nick/git/integer-mult-bounds/.venv/bin/python3.12 -B scripts/check_research_commit.py --package research/binomial-source-floor --check-source-history +``` + +On another machine, replace the absolute interpreter path with its CPython +3.12 executable. The direct marker is `PASS_BINOMIAL_SOURCE_FLOOR no_new_kappa`. +The checker prints a generated receipt with package and cited-input hashes. +`--receipt /absolute/path/outside/the/checkout/receipt.json` also saves it. +It creates no files by default. + +The independent root/nonroot slot enumerator passes 2,250 inventory/cap cases, +including 459 strict comparisons. A product-histogram implementation passes +1,640 attaining cases through height six. Eight semantic checks cover the +strict cutoff, height change, exact first correction and the Q cap + ) + correction += paid**depth * missing + return targets**(degree + 1) + (paid - targets) * correction diff --git a/research/binomial-source-floor/verify.py b/research/binomial-source-floor/verify.py new file mode 100644 index 0000000000..39d7996378 --- /dev/null +++ b/research/binomial-source-floor/verify.py @@ -0,0 +1,197 @@ +#!/usr/bin/env python3 +"""Check the new lower envelope without running predecessor executables.""" + +import argparse +from collections import Counter +from hashlib import sha256 +from itertools import combinations_with_replacement, product +import json +from math import prod +from pathlib import Path +import sys + +from floor import height, need, source_floor + + +PACKAGE = Path(__file__).resolve().parent +ROOT = PACKAGE.parents[1] + + +def source_inputs(): + manifest = json.loads((PACKAGE / "SOURCES.json").read_text()) + hashes = {} + for row in manifest["files"]: + if row["usage"] == "input": + raw = (ROOT / row["path"]).read_bytes() + digest = sha256(raw).hexdigest() + need(digest == row["sha256"], "changed input: " + row["path"]) + hashes[row["path"]] = digest + need(len(hashes) == 2, "expected two cited source inputs") + return hashes + + +def products(tokens, length): + """Literal token words: multiplicities remain distinct positions.""" + need(len(tokens) <= 5 and 0 <= length <= 3, "literal word bound") + return tuple(prod(word) for word in product(tokens, repeat=length)) + + +def source_slots(targets, paid, cap): + """Independent root/nonroot slots, without the telescope or binomial law.""" + low = min(targets) + degree = height(low, cap) + need(degree <= 3 and len(targets) <= 5 and len(paid) <= 5, "slot domain") + need(max(paid) < low, "paid/target separation") + total = len(targets) * sum(value <= cap for value in products(targets, degree)) + for depth in range(1, degree + 1): + prefixes = products(paid, depth - 1) + suffixes = products(targets, degree - depth) + for prefix, rank, suffix, last in product(prefixes, paid, suffixes, targets): + if prefix * rank * suffix <= cap < prefix * suffix * last: + total += 1 + return total + + +def histogram_source(targets, paid, cap): + """Independent product histograms for larger attaining examples.""" + degree = height(min(targets), cap) + need(len(targets) <= 8 and len(paid) <= 8, "histogram token bound") + need(max(paid) < min(targets), "histogram separation") + target_powers, paid_powers = [Counter({1: 1})], [Counter({1: 1})] + for _ in range(degree): + for tokens, powers in ((targets, target_powers), (paid, paid_powers)): + following = Counter() + for value, count in powers[-1].items(): + for rank in tokens: + following[value * rank] += count + powers.append(following) + eligible = [ + sum(a * b for r, a in paid_powers[d].items() + for k, b in target_powers[degree - d].items() if r * k <= cap) + for d in range(degree + 1) + ] + w, q = len(targets), len(paid) + return w * eligible[0] + sum( + w * eligible[d] - q * eligible[d - 1] for d in range(1, degree + 1) + ) + + +def literal_checks(): + cases = strict = 0 + for low in (2, 3): + for maximum in (low + 1, low + 2): + for middle in range(low, maximum): + targets = (low, middle, maximum) + for q in (3, 4): + for paid in combinations_with_replacement(range(1, low), q): + for cap in range(1, low**4): + actual = source_slots(targets, paid, cap) + bound = source_floor(low, maximum, 3, q, 1, cap) + need(actual >= bound, "lower envelope failed") + if middle == low and set(paid) == {1}: + need(actual == bound, "collapsed inventory must attain") + strict += actual > bound + cases += 1 + return {"literal_inventories_and_caps": cases, "strict_comparisons": strict} + + +def attaining_checks(): + cases = 0 + for low in (2, 3, 4): + for maximum in (low + 1, 2 * low + 1): + for w in range(2, 6): + for t in range(1, w): + for q in (w, w + 1): + targets = (low,) * (w - t) + (maximum,) * t + for degree in range(7): + caps = {low**degree, low**(degree + 1) - 1} + for cap in sorted(caps): + bound = source_floor(low, maximum, w, q, t, cap) + actual = histogram_source(targets, (1,) * q, cap) + need(actual == bound, "sharpness failed") + cases += 1 + return {"attaining_inventories_and_caps": cases} + + +def controls(): + need(source_floor(3, 8, 3, 5, 1, 26) == 29, "sharp first correction") + need(source_slots((3, 7, 8), (1,) * 5, 26) == 35, "uncollapsed fixture") + need(source_floor(3, 8, 3, 3, 1, 26) == 27, "Q=W boundary") + need(source_floor(3, 8, 3, 5, 1, 8) == 9, "height-one slab") + need(source_floor(3, 8, 3, 5, 1, 9) == 37, "new slab entry") + need(source_floor(2, 3, 2, 3, 1, 3) == 4, "strict cutoff equality") + # Q low**3, "two-block threshold") + need(q0 > w and 0 < t < w, "positive correction hypotheses") + extra = (q0 - w) * t**2 + missing = sum(a * b for a, n in ((w - t, low), (t, maximum)) + for b, m in ((w - t, low), (t, maximum)) if n * m >= low**3) + need(missing == t**2, "first activation count") + need(all(rank < low**3 for rank in (low, maximum)), "depth-one deficit") + result = w**3 + extra + return {"product_power": v, "first_strict_height": 2, + "first_strict_floor_sha256": sha256(str(result).encode()).hexdigest(), + "correction_bit_length": extra.bit_length(), + "correction_sha256": sha256(str(extra).encode()).hexdigest()} + + +def run(): + hashes = source_inputs() + result = {"schema_version": 1, "status": "PASS_BINOMIAL_SOURCE_FLOOR"} + for check in (literal_checks, attaining_checks, controls, selected_application): + result.update(check()) + need(source_inputs() == hashes, "input changed during verification") + result["source_sha256"] = hashes + result["package_sha256"] = { + p.name: sha256(p.read_bytes()).hexdigest() + for p in sorted(PACKAGE.iterdir()) if p.is_file() and p.suffix in (".py", ".md", ".json") + } + return result + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--receipt", type=Path, help="write a hash-bound receipt outside the checkout") + args = parser.parse_args() + if args.receipt: + need(not args.receipt.resolve().is_relative_to(ROOT), "receipt must be outside checkout") + sys.set_int_max_str_digits(100000) + result = run() + encoded = json.dumps(result, indent=2, sort_keys=True) + "\n" + if args.receipt: + args.receipt.write_text(encoded) + print(encoded, end="") + print("PASS_BINOMIAL_SOURCE_FLOOR no_new_kappa") + + +if __name__ == "__main__": + main() From 71e3fdc9e859711d8dd7ca43cfc81781dcdf5d1a Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Tue, 17 Nov 2026 22:49:35 +0000 Subject: [PATCH 2/2] fix(ci): sync CI verification doc and historical replay-gap verifier --- docs/ci-verification.md | 19 +++++- .../historical-selected-replay-gap/README.md | 6 +- .../SOURCES.json | 60 +++++++++--------- .../VERIFY.json | 31 +-------- .../historical-selected-replay-gap/verify.py | 63 ++++++++++++++----- 5 files changed, 100 insertions(+), 79 deletions(-) diff --git a/docs/ci-verification.md b/docs/ci-verification.md index 63ba3e9aa8..52b62d0481 100644 --- a/docs/ci-verification.md +++ b/docs/ci-verification.md @@ -1,8 +1,25 @@ # CI verification -## Current selected-family replay: #6030 +## Current selected-family replay: #7000 with #7001 The [selected record](../certificates/selected-result.json) binds conditional +κ = 0.00363005817 to the [application review](research/pr-intake-evidence/pr7000-application/PROOF-REVIEW.md), +[validation receipts](research/pr-intake-evidence/pr7000-application/VALIDATION.json), +and [explicit source closure](../certificates/frontier7000-source.json). +`make frontier7000-verify` follows that exact-source selected replay. The review +reuses eleven authenticated preceding executions and records seven fresh serial +application, scalar and complete native-catalogue executions. The earlier +monolithic timeout is retained separately and is not completed coverage. +Consult the receipts for exact commands, source heads and limits. + +The five inherited framework assumptions remain. No complete uniform word, +literal multiplier execution, independent human proof or formal-kernel proof +is asserted. Routine research submissions do not need to rerun this +selected-family replay. The sections below preserve historical checkpoints. + +## Historical selected-family replay: #6030 + +The [historical checkpoint](../certificates/checkpoints/frontier6030.json) binds conditional κ = 0.003125804 to the [proof review](research/pr-intake-evidence/pr6030-audit/PROOF-REVIEW.md), [validation receipts](research/pr-intake-evidence/pr6030-audit/VALIDATION.json), and [explicit source closure](../certificates/frontier6030-source.json). diff --git a/research/historical-selected-replay-gap/README.md b/research/historical-selected-replay-gap/README.md index 55d8cc3b49..36d9a873ca 100644 --- a/research/historical-selected-replay-gap/README.md +++ b/research/historical-selected-replay-gap/README.md @@ -69,7 +69,11 @@ python3 -B scripts/research_package.py --package research/historical-selected-re The direct command prints `PASS_HISTORICAL_SELECTED_REPLAY_GAP`. A registered replay prints `PASS_REGISTERED_RESEARCH_PACKAGE`. Both require Git history -containing the two inspected commits. +containing the two inspected commits and the source and manifest objects at +`2485805a6d47f36ea83ddde6327d453ac82d44dc`. The verifier uses a temporary +sparse checkout of that commit, checks the declared source digests there, and +uses its planner and manifest inventory. The recorded rejections and selection +therefore remain reproducible after later changes to the live Makefile or CI guide. ## Open next questions diff --git a/research/historical-selected-replay-gap/SOURCES.json b/research/historical-selected-replay-gap/SOURCES.json index c1010eec95..62bb8b3950 100644 --- a/research/historical-selected-replay-gap/SOURCES.json +++ b/research/historical-selected-replay-gap/SOURCES.json @@ -4,13 +4,13 @@ "files": [ { "path": "Makefile", - "usage": "input", + "usage": "provenance", "git_blob": "0d683a06b9e7ee162496108ce9a7c5d2ee94fccf", "sha256": "4f2d4f2dcd15139ec82658a975f85ed300897385f85799218539f4c8d60567da" }, { "path": "certificates/partial-swap-network.json", - "usage": "input", + "usage": "provenance", "git_blob": "eccafa830c16170c36faf93045ddf1f638f7bcd4", "sha256": "4c0b9d37e1034b2076e30a70f8e514416298c462d9ee98bc87fe6556b14df786" }, @@ -22,7 +22,7 @@ }, { "path": "docs/ci-verification.md", - "usage": "input", + "usage": "provenance", "git_blob": "63ba3e9aa8bdc5e942b56e34244b92b16f854085", "sha256": "c7d3027e9ad8bcbff68f07aa9576b30fb2f3c76c44d876d40c7fdbf4a3e2228a" }, @@ -34,163 +34,163 @@ }, { "path": "research/clifford-state-performance/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "6f98a0061a5104dfab82c9e806f819b41811f684", "sha256": "396d0f08df24952248140d5c65c51b8c902ef1c580892ff7ea182890530f67ee" }, { "path": "research/community-batch1047-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "5e0f92af463ec12c5e1dcc3effd44081a88af647", "sha256": "07a9daeaf2bda308a92e9a4684f13d5fc766c7772d74801fceb7f4599fdab226" }, { "path": "research/community-batch1099-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "9e13266bf85e627f1b7dc225e9530ea69fd2c7f0", "sha256": "421e1211fb1897c45621dc6801c276e53f2e6f335583c9c9049e535f87c0a3b1" }, { "path": "research/community-batch932-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "cc4d03eb59b9ab3f952735f7e88ff18c2d15d7af", "sha256": "184629cac91a5cfaca50330a88596008b824221433867dcf8117539c913c284a" }, { "path": "research/community-batch970-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "8b9f4111badf7de5d97684799560b55110e9da79", "sha256": "23188ed920e38a54006cb883e181585620821c63bf7e8b5e05d32719417cc37e" }, { "path": "research/community-frontier741-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "a5300d4e7a5381a3f443fc54c768ca6f0f236d68", "sha256": "3c820fb30e1b4d9bcfc6a7ab524375e5b2abd66b940af2c509146104f0bcd79c" }, { "path": "research/community-frontier890-audit/CONTENT-COVERAGE.json", - "usage": "input", + "usage": "provenance", "git_blob": "d7ff6d777b01d69b6ce84caf25d3b7e4a4d2f211", "sha256": "6b185a9902652f893f3ebd8ada92d2f11b6de6533a9a4d11718a8a4496101128" }, { "path": "research/community-hyperplane599-audit/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "546f37d326d10a99910ae8f908e71ef768524d98", "sha256": "65099d764bfcc39bda5e4d9966783611b094c3522dbdd1435cd498d657a8ef8e" }, { "path": "research/community-k492-audit/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "e538481e4cb16ed936d3195f2dfb5b5a9ca0a76b", "sha256": "2c0f4fa5bc150d05658af2e7c54c4d2c337dd52b7efd3d69530ae73bcbdf452a" }, { "path": "research/community-reconciliation92-audit/MANIFEST.json", - "usage": "input", + "usage": "provenance", "git_blob": "2a2e93685173d5f13cbb5abe740f5d90352e0228", "sha256": "5f501f3c118131e7d069f30ad77186eb2ad6961f9680a0ef105f4514ed41808a" }, { "path": "research/partial-swap-digest/baseline.py", - "usage": "input", + "usage": "provenance", "git_blob": "a2f0190704db83bd8ef48e46e723c49b925804fe", "sha256": "81e9af92cdf38243a540cdcff2062778e449467848d444da37a9553c12ca4c34" }, { "path": "research/r420-two-sided-basis/SOURCES.json", - "usage": "input", + "usage": "provenance", "git_blob": "5d718e11e62f4bcadecf1e02d6b61f87dbe190b0", "sha256": "d9810b0d139c5a1211fd2c1f0d142187cc1fca30026e1e7bc4f9ecfacf1596d1" }, { "path": "research/skip-clones/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "8d1bb3b9c8189e35e5d8bfdfa632d7473e8be0d5", "sha256": "0b68e63e35a97ce6b0cdb6e291b88ebaa8f2dd4afb70b2498f10ee89428258dc" }, { "path": "research/split-skip/SOURCE.json", - "usage": "input", + "usage": "provenance", "git_blob": "2ab610b6ea2edd2865fda793ef2168b0c76afb4f", "sha256": "7c2b4646a3ecfef6f881da5c43e4bd0fa9a4d1b00548b8ab458d897e16735134" }, { "path": "scripts/historical-ci-inputs/Makefile", - "usage": "input", + "usage": "provenance", "git_blob": "aff68409021c9d401a6f8013b9dfd7dbcc30f2a8", "sha256": "ea8830dd79da493e2d75baf753d733ff7efbcf2b4794afe41fae0ac8f3055646" }, { "path": "scripts/historical-ci-inputs/ledger-batch932-run_isolated_tests.py", - "usage": "input", + "usage": "provenance", "git_blob": "65db599ab0b1dea0312c4ca048e0bd0f44c3736f", "sha256": "96ea543e6c707424afe247e77bd86c82152f90fc76a0773c4232145da5cdf8d1" }, { "path": "scripts/historical-ci-inputs/ledger-batch932-test_isolated_test_runner.py", - "usage": "input", + "usage": "provenance", "git_blob": "34820a8f24678f918f4d0e7a35380d8013fc3495", "sha256": "628391b6abfbc8674ceec1751867a4392f2cc0b5b66886243e139af86cf355ac" }, { "path": "scripts/historical-ci-inputs/ledger-batch970-verify_selected_result.py", - "usage": "input", + "usage": "provenance", "git_blob": "c755b76e0d44ba4917aa94440ebe54daefce5b2a", "sha256": "d7fd929726b326aeeaf0a3996475adec88eee9aac09ae0bebeeaa0bc1fc8f199" }, { "path": "scripts/historical-ci-inputs/ledger-frontier741-ci-verification.md", - "usage": "input", + "usage": "provenance", "git_blob": "7f3c012504187917a728b9fe87043f0fc8cd006a", "sha256": "a854022e0e1d5d4db4d60e586be3ea56005013ef14a1fc06d02bc06e8529c4b0" }, { "path": "scripts/historical-ci-inputs/partial-swap-context.json", - "usage": "input", + "usage": "provenance", "git_blob": "ad65114886bf34a4fd27e79f3be502389e689faa", "sha256": "833a9642f33aeab2ffea17ec9c6b82e0a953f90192b2c82e10bef21538dccba9" }, { "path": "scripts/historical-ci-inputs/partial-swap-network.json", - "usage": "input", + "usage": "provenance", "git_blob": "52075f2463f60af5e16571347f24274fce73a1ea", "sha256": "f3c4be597b2f2136da4ae2cc80c7454f63c90aa01f84e5b8131cee4dd55de815" }, { "path": "scripts/partial_swap/shared.py", - "usage": "input", + "usage": "provenance", "git_blob": "44a0e454c70f9c4b98e258b8443612e6a119904b", "sha256": "5a0646a50b9f3e8ea55168620a78e8853b0ab810517cefc8cfb8696aedee278a" }, { "path": "scripts/replay_historical_check.py", - "usage": "input", + "usage": "provenance", "git_blob": "1e92fff2782970ef71378f594f2350d245a4db26", "sha256": "5467619c78183d3adc82b0cb55af28e5c1a01fca2b0588677816244b53e2bafd" }, { "path": "scripts/research_package.py", - "usage": "input", + "usage": "provenance", "git_blob": "091b4c8f58bac9a9580d76025b887dc5c873d05f", "sha256": "e1256016e7f51827d04fa2179255989f639ae1d97afaa9c16265f85a0c6abd70" }, { "path": "scripts/run_isolated_tests.py", - "usage": "input", + "usage": "provenance", "git_blob": "a96ab35b315ce492e7fbbfd6c5ae211aa066b541", "sha256": "49eb56dd0fc0d8d8ffdb209970a7adf2176223580646f575d5c22e59543b381c" }, { "path": "scripts/verify_selected_result.py", - "usage": "input", + "usage": "provenance", "git_blob": "6882a4700e410dec569b51ae2eaf1a19cc019195", "sha256": "d6b305eac5b9bdb8172c469ad30a1655a60fa0aceac8b1bf610e1b73f51babd8" }, { "path": "tests/test_isolated_test_runner.py", - "usage": "input", + "usage": "provenance", "git_blob": "343b24abf6719b81805eba5a84c74e57634c8288", "sha256": "3a5470d0b139828b90e19bf9583ddeafcd69f8e34f2824664eb3a2958a52e34d" } diff --git a/research/historical-selected-replay-gap/VERIFY.json b/research/historical-selected-replay-gap/VERIFY.json index 98553e72ed..ab7efa3471 100644 --- a/research/historical-selected-replay-gap/VERIFY.json +++ b/research/historical-selected-replay-gap/VERIFY.json @@ -4,36 +4,7 @@ "python": "3.12", "requirements": [], "inputs": [ - "Makefile", - "certificates/partial-swap-network.json", - "docs/ci-verification.md", - "research/clifford-state-performance/SOURCE.json", - "research/community-batch1047-audit/CONTENT-COVERAGE.json", - "research/community-batch1099-audit/CONTENT-COVERAGE.json", - "research/community-batch932-audit/CONTENT-COVERAGE.json", - "research/community-batch970-audit/CONTENT-COVERAGE.json", - "research/community-frontier741-audit/CONTENT-COVERAGE.json", - "research/community-frontier890-audit/CONTENT-COVERAGE.json", - "research/community-hyperplane599-audit/SOURCE.json", - "research/community-k492-audit/SOURCE.json", - "research/community-reconciliation92-audit/MANIFEST.json", - "research/partial-swap-digest/baseline.py", - "research/r420-two-sided-basis/SOURCES.json", - "research/skip-clones/SOURCE.json", - "research/split-skip/SOURCE.json", - "scripts/historical-ci-inputs/Makefile", - "scripts/historical-ci-inputs/ledger-batch932-run_isolated_tests.py", - "scripts/historical-ci-inputs/ledger-batch932-test_isolated_test_runner.py", - "scripts/historical-ci-inputs/ledger-batch970-verify_selected_result.py", - "scripts/historical-ci-inputs/ledger-frontier741-ci-verification.md", - "scripts/historical-ci-inputs/partial-swap-context.json", - "scripts/historical-ci-inputs/partial-swap-network.json", - "scripts/partial_swap/shared.py", - "scripts/replay_historical_check.py", - "scripts/research_package.py", - "scripts/run_isolated_tests.py", - "scripts/verify_selected_result.py", - "tests/test_isolated_test_runner.py" + "scripts/research_package.py" ], "commands": [ { diff --git a/research/historical-selected-replay-gap/verify.py b/research/historical-selected-replay-gap/verify.py index 83b995941a..9d266c5a4e 100644 --- a/research/historical-selected-replay-gap/verify.py +++ b/research/historical-selected-replay-gap/verify.py @@ -6,8 +6,10 @@ """ import hashlib import importlib.util +import json import subprocess import sys +import tempfile from pathlib import Path ROOT = Path(__file__).resolve().parents[2] @@ -61,31 +63,47 @@ def require(ok, message): raise SystemExit(message) -def load_checker(): - path = ROOT / "scripts/replay_historical_check.py" - spec = importlib.util.spec_from_file_location("historical_selected_replay_gap_checker", path) +def load_module(path): + spec = importlib.util.spec_from_file_location(path.stem, path) module = importlib.util.module_from_spec(spec) spec.loader.exec_module(module) return module +def checkout_snapshot(snapshot, sources, runner, env): + paths = [runner.canonical_relative_path(row["path"]) for row in sources["files"]] + git = ["git", "-c", "maintenance.auto=false", "-c", "gc.auto=0", + "-c", "core.autocrlf=false"] + subprocess.run([*git, "clone", "--quiet", "--shared", "--no-tags", "--no-checkout", + "--", str(ROOT), str(snapshot)], cwd=ROOT, env=env, check=True) + subprocess.run([*git, "update-ref", "--no-deref", "HEAD", INSPECTED], + cwd=snapshot, env=env, check=True) + # The pinned planner reads omitted manifests from the sparse HEAD/index. + patterns = "".join(f"/{path.as_posix()}\n" for path in paths) + subprocess.run([*git, "sparse-checkout", "set", "--no-cone", "--stdin"], + cwd=snapshot, env=env, input=patterns.encode("utf-8"), check=True) + subprocess.run([*git, "read-tree", "-mu", "HEAD"], cwd=snapshot, env=env, check=True) + for path, row in zip(paths, sources["files"], strict=True): + require(hashlib.sha256((snapshot / path).read_bytes()).hexdigest() == row["sha256"], + "historical checkout source digest changed: " + path.as_posix()) + + def entries(checker): for name, config in checker.CONFIG.items(): for entry in [config, *config.get("additional_inputs", [])]: yield name, entry -def reject(checker, entry): +def reject(root, checker, entry): try: - checker.authenticated_input(ROOT, entry) + checker.authenticated_input(root, entry) except ValueError as exc: return str(exc) raise SystemExit("historical input was admitted: " + entry["path"]) -def main(): - require(not sys.flags.optimize, "assertions must stay enabled") - checker = load_checker() +def check_snapshot(root, env): + checker = load_module(root / "scripts/replay_historical_check.py") selected = [entry for name, entry in entries(checker) if name == "tooling-ledger" and entry["path"] == SELECTED_PATH] require(len(selected) == 1, "selected-result checker overlay is not unique") @@ -94,7 +112,7 @@ def main(): require(entry["accepted_live_sha256"] == [SELECTED_ACCEPTED], "accepted selected-checker successors changed") frozen = (checker.INPUTS / entry["input"]).read_bytes() - live = (ROOT / SELECTED_PATH).read_bytes() + live = (root / SELECTED_PATH).read_bytes() require(hashlib.sha256(frozen).hexdigest() == SELECTED_PIN, "frozen selected checker bytes changed") require(hashlib.sha256(live).hexdigest() == SELECTED_LIVE, "live selected checker digest changed") require(SELECTED_LIVE not in (SELECTED_PIN, SELECTED_ACCEPTED), "live checker was already admitted") @@ -102,7 +120,7 @@ def main(): # live successor, not a broken comparison. require(SELECTED_PIN in (SELECTED_PIN, *entry["accepted_live_sha256"]), "pin membership control failed") - require(reject(checker, entry) == REJECTIONS[SELECTED_PATH][1], + require(reject(root, checker, entry) == REJECTIONS[SELECTED_PATH][1], "selected checker rejection text changed") counts = {path: 0 for path in REJECTIONS} @@ -110,7 +128,7 @@ def main(): for _name, item in entries(checker): if item["path"] not in REJECTIONS: continue - message = reject(checker, item) + message = reject(root, checker, item) counts[item["path"]] += 1 messages.setdefault(item["path"], message) for path, (count, message) in REJECTIONS.items(): @@ -118,20 +136,31 @@ def main(): require(messages[path] == message, "rejection text changed for " + path) require(sum(counts.values()) == 19, "rejection total changed") ci = [item for _name, item in entries(checker) if item["path"] == CI_PATH] - require(len(ci) == 1 and hashlib.sha256((ROOT / CI_PATH).read_bytes()).hexdigest() == CI_LIVE, + require(len(ci) == 1 and hashlib.sha256((root / CI_PATH).read_bytes()).hexdigest() == CI_LIVE, "selected CI note digest changed") diff = subprocess.check_output( - ["git", "diff", "--name-only", PARENT, INSPECTED], cwd=ROOT, text=True) + ["git", "diff", "--name-only", PARENT, INSPECTED], cwd=root, env=env, text=True) changed = sorted(name for name in diff.splitlines() if name) require(changed == CHANGED, "inspected commit diff changed") - sys.path.insert(0, str(ROOT / "scripts")) - from research_package import plan_details - details = plan_details(ROOT, set(changed)) + planner = load_module(root / "scripts/research_package.py") + details = planner.plan_details(root, set(changed)) require([row["package"] for row in details] == PLAN_PACKAGES, "helper plan selection changed") matched = {name for row in details for names in row["causes"].values() for name in names} require(sorted(set(changed) - matched) == UNMATCHED, "unmatched plan paths changed") - require(plan_details(ROOT, set()) == [], "empty change set selected a package") + require(planner.plan_details(root, set()) == [], "empty change set selected a package") + + +def main(): + require(not sys.flags.optimize, "assertions must stay enabled") + sources = json.loads(Path(__file__).with_name("SOURCES.json").read_bytes()) + require(sources["base_commit"] == INSPECTED, "historical checkout base changed") + runner = load_module(ROOT / "scripts/research_package.py") + env = runner.git_source_env() + with tempfile.TemporaryDirectory(prefix="historical-selected-replay-") as temporary: + snapshot = Path(temporary) / "snapshot" + checkout_snapshot(snapshot, sources, runner, env) + check_snapshot(snapshot, env) print("PASS_HISTORICAL_SELECTED_REPLAY_GAP") print("selected_checker_live=" + SELECTED_LIVE) print("rejections=19 distinct_paths=7 plan_packages=9")