From 4eece58f5cebdb70a92d65447974f1c02383f60b Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Fri, 13 Nov 2026 13:49:37 +0000 Subject: [PATCH 1/2] feat(research): query canonical padded-rotation switches directly --- .../canonical-rotation-switch-query/PROOF.md | 238 ++++++++++++++++++ .../canonical-rotation-switch-query/README.md | 132 ++++++++++ .../SOURCES.json | 42 ++++ .../canonical-rotation-switch-query/TASK.json | 94 +++++++ .../VERIFY.json | 35 +++ .../rotation_query.py | 56 +++++ .../canonical-rotation-switch-query/verify.py | 151 +++++++++++ 7 files changed, 748 insertions(+) create mode 100644 research/canonical-rotation-switch-query/PROOF.md create mode 100644 research/canonical-rotation-switch-query/README.md create mode 100644 research/canonical-rotation-switch-query/SOURCES.json create mode 100644 research/canonical-rotation-switch-query/TASK.json create mode 100644 research/canonical-rotation-switch-query/VERIFY.json create mode 100644 research/canonical-rotation-switch-query/rotation_query.py create mode 100644 research/canonical-rotation-switch-query/verify.py diff --git a/research/canonical-rotation-switch-query/PROOF.md b/research/canonical-rotation-switch-query/PROOF.md new file mode 100644 index 0000000000..80a8295201 --- /dev/null +++ b/research/canonical-rotation-switch-query/PROOF.md @@ -0,0 +1,238 @@ +# Direct canonical switch queries for padded rotations + +This scoped written proof gives a new arithmetic construction of the precise +deterministic tables in Cinna Davis's #4100 `check_batched_crt.py:benes`. +The source is pinned at canonical main +`e54523517d0f03e58352e647c403a5af3e525a57` in SOURCES.json. Its generic +permutation-routing theorem is a cited premise. No predecessor replay is a +deliverable of this package. This contribution was produced by Nick Petalas. + +## 1. Domain and result + +Let `N=2^h`, `h>=1`, `1<=s<=N`, and `0<=a1`, the first row is + +``` +F(x) = [s and a are odd] [floor(x/2)=floor(s/2)]. (1) +``` + +The last row is + +``` +L(x) = [a is odd] [x (h-1,s_(x mod 2),a_(x mod 2),j-1,floor(x/2)). (4) +``` + +At `h=1`, the only row has constant bit `a`. If `a=0`, the entire network +is identity. Equations (1)-(4) compute one canonical bit by at most `h` +iterations, with `O(h^2)` elementary bit operations and `O(h)` working bits. +These are bounds for bounded-integer arithmetic, not a physical tape bill. + +## 2. Canonical component colors + +The source colors the graph with the two perfect matchings + +``` +A(x)=x xor 1, B(x)=P^{-1}(P(x) xor 1). +``` + +It starts each uncolored component at its least vertex with color zero. +For an even-cycle component, fixing that first color uniquely determines +all colors. DFS neighbor order therefore does not affect the result. The +source's endpoint rows are + +``` +F(x)=color(x) xor (x mod 2), +L(y)=color(P^{-1}(y)) xor (y mod 2). (5) +``` + +Call `A` pairs with coincident `B` edges doubled pairs. Every doubled pair +whose least endpoint is even has colors equal to address parity. +Write `s=2m+epsilon`, `a=2b+delta`. + +If `s` and `a` are both even, all components are doubled pairs. If `s` is +even and `a` is odd, the active interval `[0,s-1]` forms one alternating +cycle: its `B` edges are `(1,2),(3,4),...,(s-3,s-2),(s-1,0)`. +All remaining components are doubled pairs. Both cases give +`color(x)=x mod 2` everywhere. The size-two cycle may itself be doubled. + +Suppose `s` is odd and `a` is even. The component containing the first +padded vertex `s` is the interval `[s-a-1,s]`. Its edges alternate along +successive vertices, with one closing `B` edge between the interval's +endpoints. Its least vertex `s-a-1` is even. Every other component is a +doubled pair. Again `color(x)=x mod 2` everywhere. For `a=0` the named +interval is just the doubled pair `(s-1,s)`. + +Finally suppose `s` and `a` are odd. Put `t=s-a`, which is even and at +least two. The exceptional component has vertices + +``` +0,1,...,t-1, s, s-1. +``` + +There are alternating consecutive edges on `[0,t-1]`, the `B` edges +`(t-1,s)` and `(s-1,0)`, and the `A` edge `(s-1,s)`. +Starting at zero gives parity colors on `[0,t-1]`, color zero at `s`, +and color one at `s-1`. All other components are doubled pairs. Hence + +``` +color(x) = (x mod 2) xor [x in {s-1,s}]. (6) +``` + +These descriptions follow directly by substituting the rotation and its +inverse into `B`; they list all edges because each vertex has one `A` +neighbor and one `B` neighbor. In particular they also identify each +component's least vertex and settle the source's orientation convention. +Substitution in the first equation of (5) proves (1). + +## 3. The last row + +For `y=a`, and `y+s-a` when `y=s` the inverse is `y`. + +When `s` is even, the active inverse changes parity exactly when `a` is +odd, giving the first line of (2). When `s` is odd and `a` even, precisely +`y (x+a) mod s` on +`x1`, the first row is zero except for the pair `{s-1,s}` when both +`s` and `a` are odd. The last row has the following one-bit predicate at +the current wire address `x`. + +| Parameters | Last-row bit | +| --- | --- | +| s even | `[a odd] [x None: + if not condition: + raise ValueError(message) + + +def endpoint_bit(modulus: int, offset: int, address: int, last: bool) -> int: + """Internal endpoint formula; the public query validates the domain.""" + if not last: + return int((modulus & offset & 1) and address // 2 == modulus // 2) + if modulus % 2 == 0: + return int(offset % 2 == 1 and address < modulus) + if offset % 2 == 0: + return int(address < offset) + return int(offset - 1 <= address <= modulus) + + +def child_parameters(modulus: int, offset: int, branch: int) -> tuple[int, int]: + """Internal recurrence, including an empty identity child.""" + child_modulus = modulus // 2 + int(modulus % 2 == 1 and branch == offset % 2) + raw_offset = offset // 2 + branch * (offset % 2) + child_offset = 0 if raw_offset == child_modulus else raw_offset + return child_modulus, child_offset + + +def switch_bit(h: int, modulus: int, offset: int, layer: int, address: int) -> int: + """Return a bit of precisely the source's deterministic network. + + The conceptual domain is every h >= 1. The executable caps h at 4096 + to bound interpreter allocation and work. No permutation or ROM is built. + """ + require(all(type(value) is int for value in (h, modulus, offset, layer, address)), + "integer parameters") + require(1 <= h <= 4096, "1 <= h <= 4096") + require(1 <= modulus <= 1 << h, "modulus in occupied address domain") + require(0 <= offset < modulus, "canonical offset") + require(0 <= layer < 2 * h - 1, "network layer") + require(0 <= address < 1 << h, "network address") + for _ in range(h): + if offset == 0: + return 0 + if h == 1: + return offset + if layer == 0 or layer == 2 * h - 2: + return endpoint_bit(modulus, offset, address, layer != 0) + modulus, offset = child_parameters(modulus, offset, address & 1) + require(0 <= offset < modulus, "nonidentity child has positive modulus") + h -= 1 + layer -= 1 + address //= 2 + raise ArithmeticError("unreachable after one descent per address bit") diff --git a/research/canonical-rotation-switch-query/verify.py b/research/canonical-rotation-switch-query/verify.py new file mode 100644 index 0000000000..69f197414a --- /dev/null +++ b/research/canonical-rotation-switch-query/verify.py @@ -0,0 +1,151 @@ +"""Finite corroboration of the new point-query construction. Apache-2.0. + +Produced by Nick Petalas. No predecessor replay entry point is invoked. +""" + +import argparse +import hashlib +import importlib.util +import json +from pathlib import Path + +from rotation_query import child_parameters, endpoint_bit, require, switch_bit + + +PACKAGE = Path(__file__).resolve().parent +ROOT = PACKAGE.parents[1] +REFERENCE = "research/unconditional-batched-crt/check_batched_crt.py" + + +def load_reference(): + """Authenticate the exact canonical definition used as the comparison oracle.""" + pins = json.loads((PACKAGE / "SOURCES.json").read_text()) + rows = [row for row in pins["files"] if row["path"] == REFERENCE] + require(len(rows) == 1 and rows[0]["usage"] == "input", "one live source pin") + for row in pins["files"]: + if row["usage"] == "input": + require(row["path"] in (REFERENCE, "research/unconditional-batched-crt/NOTICE.md"), + "fixed canonical input paths") + require(hashlib.sha256((ROOT / row["path"]).read_bytes()).hexdigest() == row["sha256"], + "canonical input source hash") + path = ROOT / REFERENCE + spec = importlib.util.spec_from_file_location("canonical_rotation_reference", path) + require(spec is not None and spec.loader is not None, "reference loader") + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + return module + + +def root_check(permutation, modulus, offset, layers): + """Extract the actual child permutations, without using the new recurrence.""" + size = len(permutation) + color = tuple(layers[0][1][x] ^ (x & 1) for x in range(size)) + for last in (False, True): + row = layers[-1 if last else 0][1] + require(tuple(endpoint_bit(modulus, offset, x, last) for x in range(size)) == row, + "endpoint formula") + for branch in (0, 1): + actual = [None] * (size // 2) + for x in range(size): + if color[x] == branch: + require(actual[x // 2] is None, "one child source per pair") + actual[x // 2] = permutation[x] // 2 + child_modulus, child_offset = child_parameters(modulus, offset, branch) + expected = tuple((x + child_offset) % child_modulus if x < child_modulus else x + for x in range(size // 2)) + require(tuple(actual) == expected, "padded-rotation child closure") + + +def finite_census(reference): + networks, entries, routes, roots = 0, 0, 0, 0 + for h in range(1, 6): + size = 1 << h + for modulus in range(1, size + 1): + for offset in range(modulus): + permutation = reference.rotation(size, modulus, offset) + layers = reference.benes(permutation) + if h > 1: + root_check(permutation, modulus, offset, layers) + roots += 1 + for layer, (_, row) in enumerate(layers): + for address, expected in enumerate(row): + require(switch_bit(h, modulus, offset, layer, address) == expected, + "direct bit equals the canonical source bit") + entries += 1 + for original in range(size): + current = original + for layer in range(2 * h - 1): + axis = min(layer, 2 * h - 2 - layer) + current ^= switch_bit(h, modulus, offset, layer, current) << axis + require(current == permutation[original], "direct-query endpoint") + routes += 1 + networks += 1 + return {"networks": networks, "switch_entries": entries, + "routed_addresses": routes, "root_decompositions": roots} + + +def rejection_controls(): + invalid = ((0, 1, 0, 0, 0), (4097, 1, 0, 0, 0), (2, 0, 0, 0, 0), + (2, 5, 0, 0, 0), (2, 3, -1, 0, 0), (2, 3, 3, 0, 0), + (2, 3, 0, -1, 0), (2, 3, 0, 3, 0), (2, 3, 0, 0, -1), + (2, 3, 0, 0, 4), (True, 1, 0, 0, 0), (2, 3.0, 0, 0, 0)) + for parameters in invalid: + try: + switch_bit(*parameters) + except ValueError: + continue + raise ValueError("invalid domain accepted") + require(switch_bit(2, 3, 1, 0, 2) != 0, "odd boundary swap cannot be dropped") + require(switch_bit(3, 5, 1, 4, 5) != int(5 < 5), "padded last-row switch matters") + require(child_parameters(5, 1, 0) != (3, 0), "odd children cannot be interchanged") + require(child_parameters(6, 5, 1) == (3, 0), "child offset needs equality reduction") + require(child_parameters(5, 1, 1) != (3, 0), "branch carry cannot be dropped") + require(switch_bit(3, 5, 1, 1, 5) != switch_bit(3, 5, 1, 1, 4), + "table query follows the address's low branch bit") + return {"domain_rejections": len(invalid), "semantic_controls": 6} + + +def large_width_checks(): + checked = 0 + for h in (31, 65, 127, 1024, 4096): + modulus = (1 << h) - 1 + require(switch_bit(h, modulus, 1, 0, modulus) == 1, "large padded first row") + require(switch_bit(h, modulus, 2, 2 * h - 2, 0) == 1, "large last row") + require(switch_bit(h, modulus, 0, h - 1, modulus) == 0, "large identity") + require(switch_bit(h, 1 << h, 1 << (h - 1), h - 1, 0) == 1, + "full-depth query reaches the nonzero dyadic leaf") + checked += 4 + return checked + + +def evidence(): + reference = load_reference() + result = finite_census(reference) + result.update(rejection_controls()) + result["large_width_queries"] = large_width_checks() + bits = bytes(switch_bit(5, 17, a, 6, x) for a in range(17) for x in range(32)) + result["h5_s17_layer6_bits"] = len(bits) + result["h5_s17_layer6_sha256_bit_bytes"] = hashlib.sha256(bits).hexdigest() + files = sorted(path for path in PACKAGE.iterdir() if path.is_file()) + result["package_sha256"] = {path.name: hashlib.sha256(path.read_bytes()).hexdigest() + for path in files} + result["reference_sha256"] = hashlib.sha256((ROOT / REFERENCE).read_bytes()).hexdigest() + return result + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--receipt", type=Path) + args = parser.parse_args() + result = evidence() + payload = json.dumps(result, indent=2, sort_keys=True) + "\n" + if args.receipt is not None: + target = args.receipt.expanduser().resolve() + require(ROOT not in target.parents, "receipt must be outside the checkout") + target.write_text(payload) + print(payload, end="") + print("PASS_CANONICAL_ROTATION_SWITCH_QUERY") + + +if __name__ == "__main__": + main() From 7efb9a84277ec31abe2a934aeef8c8a70548aa5b Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Tue, 17 Nov 2026 22:48:37 +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")