From 78f5fdc4b257e44d046ce4d5b6204150b5d09477 Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Wed, 18 Nov 2026 21:15:45 +0000 Subject: [PATCH 1/2] feat(research): construct a table-free paired sampler step --- research/paired-ddg-arithmetic-step/PROOF.md | 79 ++++++++ research/paired-ddg-arithmetic-step/README.md | 81 +++++++++ .../paired-ddg-arithmetic-step/SOURCES.json | 30 ++++ research/paired-ddg-arithmetic-step/TASK.json | 97 ++++++++++ .../paired-ddg-arithmetic-step/VERIFY.json | 40 +++++ .../paired-ddg-arithmetic-step/circuit.py | 170 ++++++++++++++++++ research/paired-ddg-arithmetic-step/verify.py | 96 ++++++++++ 7 files changed, 593 insertions(+) create mode 100644 research/paired-ddg-arithmetic-step/PROOF.md create mode 100644 research/paired-ddg-arithmetic-step/README.md create mode 100644 research/paired-ddg-arithmetic-step/SOURCES.json create mode 100644 research/paired-ddg-arithmetic-step/TASK.json create mode 100644 research/paired-ddg-arithmetic-step/VERIFY.json create mode 100644 research/paired-ddg-arithmetic-step/circuit.py create mode 100644 research/paired-ddg-arithmetic-step/verify.py diff --git a/research/paired-ddg-arithmetic-step/PROOF.md b/research/paired-ddg-arithmetic-step/PROOF.md new file mode 100644 index 0000000000..0d2fbf29da --- /dev/null +++ b/research/paired-ddg-arithmetic-step/PROOF.md @@ -0,0 +1,79 @@ +# One reversible draw from a common phase residue + +The fixed source graph assigns the four ordered outcomes weights +`(144,12,12,1)/169` in order 00, 01, 10, 11. At depth $k$, let $j$ +be the index among unfinished prefixes in the source's order. Reading coin +$u$ gives child index $m=2j+u$. The next binary probability digits mark +one leaf per set digit in outcome order. Those leaves occupy the first child +indices. If there are $s$ leaves, child $m None: + self.gates: list[Gate] = [] + self.next_wire = FIRST_SCRATCH + + def fresh(self) -> int: + if self.next_wire == FIRST_SCRATCH + MAX_SCRATCH: + raise ValueError("Boolean scratch capacity exceeded") + wire = self.next_wire + self.next_wire += 1 + return wire + + def toggle(self, target: int, signal: Signal) -> None: + if signal is True: + self.gates.append((target, ())) + elif signal is not False: + self.gates.append((target, (signal,))) + + def xor(self, left: Signal, right: Signal) -> Signal: + if left is False or right is False: + return right if left is False else left + if type(left) is type(right) and left == right: + return False + target = self.fresh() + self.toggle(target, left) + self.toggle(target, right) + return target + + def both(self, left: Signal, right: Signal) -> Signal: + if left is False or right is False: + return False + if left is True or right is True: + return right if left is True else left + if left == right: + return left + target = self.fresh() + self.gates.append((target, (left, right))) + return target + + def add(self, left: Word, right: Word, carry: Signal = False) -> Word: + if len(left) != len(right) or not 1 <= len(left) <= 9: + raise ValueError("invalid ripple adder widths") + total = [] + for x, y in zip(left[:-1], right[:-1], strict=True): + difference = self.xor(x, y) + total.append(self.xor(difference, carry)) + carry = self.xor(self.both(x, y), self.both(difference, carry)) + total.append(self.xor(self.xor(left[-1], right[-1]), carry)) + return tuple(total) + + def select(self, flag: Signal, low: Word, high: Word) -> Word: + if len(low) != len(high) or not 1 <= len(low) <= 8: + raise ValueError("invalid selector widths") + return tuple( + self.xor(x, self.both(flag, self.xor(x, y))) + for x, y in zip(low, high, strict=True) + ) + + def equal(self, left: Word, right: Word) -> Signal: + if len(left) != len(right) or len(left) != 3: + raise ValueError("invalid index widths") + equal: Signal = True + for x, y in zip(left, right, strict=True): + equal = self.both(equal, self.xor(self.xor(x, y), True)) + return equal + + +def bits(value: int, width: int) -> Word: + if not 1 <= width <= 9 or not 0 <= value < 1 << width: + raise ValueError("constant does not fit its word") + return tuple(bool(value & (1 << index)) for index in range(width)) + + +def add_mod(circuit: Circuit, left: Word, right: Word) -> Word: + total = circuit.add((*left, False), (*right, False)) + reduced = circuit.add(total, bits(512 - MODULUS, 9)) + return circuit.select(reduced[8], reduced[:8], total[:8]) + + +def phase_digits(circuit: Circuit, phase: Word, doubled: Word) -> tuple[Signal, Signal, Signal]: + triple = add_mod(circuit, doubled, phase) + six = add_mod(circuit, triple, triple) + twelve = add_mod(circuit, six, six) + twenty_four = add_mod(circuit, twelve, twelve) + twenty_five = add_mod(circuit, twenty_four, phase) + + threshold = bits(256 - 85, 9) + high_25 = circuit.add((*twenty_five, False), threshold)[8] + high_12 = circuit.add((*twelve, False), threshold)[8] + high_1 = circuit.add((*phase, False), threshold)[8] + return circuit.xor(high_25, True), high_12, high_1 + + +def prefix_indices(circuit: Circuit, first: Signal, middle: Signal) -> tuple[Word, Word, Word]: + return (first, False, False), (circuit.xor(first, True), first, False), (first, middle, False) + + +def advance(circuit: Circuit) -> Word: + phase = PACKET[:8] + doubled = add_mod(circuit, phase, phase) + first, middle, last = phase_digits(circuit, phase, doubled) + rank = (COIN_WIRE, *PACKET[8:10]) + p01, p10, p11 = prefix_indices(circuit, first, middle) + leaf_00 = circuit.both(first, circuit.equal(rank, bits(0, 3))) + leaf_01 = circuit.both(middle, circuit.equal(rank, p01)) + leaf_10 = circuit.both(middle, circuit.equal(rank, p10)) + leaf_11 = circuit.both(last, circuit.equal(rank, p11)) + low = circuit.xor(leaf_01, leaf_11) + high = circuit.xor(leaf_10, leaf_11) + done = circuit.xor(circuit.xor(leaf_00, leaf_01), circuit.xor(leaf_10, leaf_11)) + + count = circuit.add((first, middle, False), (last, False, False)) + complement = tuple(circuit.xor(bit, True) for bit in count) + index = circuit.add(rank, complement, carry=True)[:2] + return (*doubled, *circuit.select(done, index, (low, high)), done) + + +def retreat(circuit: Circuit) -> Word: + doubled = PACKET[:8] + offset = tuple(circuit.both(doubled[0], bit) for bit in bits(MODULUS, 9)) + phase = circuit.add((*doubled, False), offset)[1:] + first, middle, last = phase_digits(circuit, phase, doubled) + low, high, done = PACKET[8:] + p01, p10, p11 = prefix_indices(circuit, first, middle) + lower = circuit.select(low, bits(0, 3), p01) + upper = circuit.select(low, p10, p11) + leaf_rank = circuit.select(high, lower, upper) + + count = circuit.add((first, middle, False), (last, False, False)) + live_rank = circuit.add((low, high, False), count) + rank = circuit.select(done, live_rank, leaf_rank) + return (*phase, *rank[1:], False) + + +def clean_oracle(circuit: Circuit, output: Word) -> tuple[Gate, ...]: + computation = tuple(circuit.gates) + for target, signal in zip(BACKING, output, strict=True): + circuit.toggle(target, signal) + return (*circuit.gates, *reversed(computation)) + + +def reversible_step() -> tuple[tuple[Gate, ...], int]: + forward = Circuit() + forward_oracle = clean_oracle(forward, advance(forward)) + backward = Circuit() + backward_oracle = clean_oracle(backward, retreat(backward)) + swap = tuple( + gate + for a, b in zip(PACKET, BACKING, strict=True) + for gate in ((a, (b,)), (b, (a,)), (a, (b,))) + ) + scratch_end = max(forward.next_wire, backward.next_wire) + return (*forward_oracle, *swap, *backward_oracle), scratch_end diff --git a/research/paired-ddg-arithmetic-step/verify.py b/research/paired-ddg-arithmetic-step/verify.py new file mode 100644 index 0000000000..d0c879dc61 --- /dev/null +++ b/research/paired-ddg-arithmetic-step/verify.py @@ -0,0 +1,96 @@ +"""Check the new gate list against a direct floor-count specification.""" + +from collections import Counter + +from circuit import COIN_WIRE, FIRST_SCRATCH, MODULUS, PACKET_WIDTH, Gate, reversible_step + +WEIGHTS = (144, 12, 12, 1) +PERIOD = 156 +EXPECTED = (232, 2238, 590, 473) + + +def require(condition: bool, message: str) -> None: + if not condition: + raise ValueError(message) + + +def packet(phase: int, node: int, done: bool = False) -> int: + return phase | (node << 8) | (int(done) << 10) + + +def comparisons() -> tuple[tuple[int, int], ...]: + cases = [] + unfinished = 1 + phase = 1 + powers = 1 + phases = set() + for _ in range(PERIOD): + require(phase not in phases, "phase repeated before the closing edge") + phases.add(phase) + next_phase = (2 * powers) % MODULUS + leaves = tuple( + label for label, weight in enumerate(WEIGHTS) + if (2 * powers * weight) // MODULUS - 2 * (powers * weight // MODULUS) + ) + require(1 <= unfinished <= 3, "reference index does not fit two bits") + for rank in range(2 * unfinished): + node, coin = divmod(rank, 2) + output = leaves[rank] if rank < len(leaves) else rank - len(leaves) + before = packet(phase, node) | (coin << COIN_WIRE) + after = packet(next_phase, output, rank < len(leaves)) | (coin << COIN_WIRE) + cases.append((before, after)) + unfinished = 2 * unfinished - len(leaves) + powers *= 2 + phase = next_phase + require((phase, unfinished) == (1, 1), "reference graph did not close") + return tuple(cases) + + +def lanes(records: tuple[int, ...], width: int) -> list[int]: + return [ + sum(((record >> wire) & 1) << index for index, record in enumerate(records)) + for wire in range(width) + ] + + +def run(gates: tuple[Gate, ...], records: tuple[int, ...], width: int) -> list[int]: + state = lanes(records, width) + full = (1 << len(records)) - 1 + for target, controls in gates: + flip = full + for control in controls: + flip &= state[control] + state[target] ^= flip + return state + + +def main() -> None: + gates, width = reversible_step() + for target, controls in gates: + require(0 <= target < width and target != COIN_WIRE, "illegal gate target") + require(len(controls) <= 2 and len(set(controls)) == len(controls), "illegal gate arity") + require(all(0 <= x < width and x != target for x in controls), "illegal gate controls") + counts = Counter(len(controls) for _, controls in gates) + bill = (counts[0], counts[1], counts[2], width - FIRST_SCRATCH) + require(bill == EXPECTED, f"gate or scratch bill changed: {bill}") + + pairs = comparisons() + before, after = zip(*pairs, strict=True) + require(len(set(after)) == len(after), "reference inverse is not unique") + require(run(gates, before, width) == lanes(after, width), "forward or cleanup mismatch") + require(run(tuple(reversed(gates)), after, width) == lanes(before, width), "inverse mismatch") + + # A spurious NOT on an erased bit must change the check, even with correct outputs. + dirty = (*gates, (FIRST_SCRATCH, ())) + require(run(dirty, before, width) != lanes(after, width), "dirty scratch went undetected") + # A spurious NOT on the stopping flag leaves the phase and node intact. + wrong_stop = (*gates, (PACKET_WIDTH - 1, ())) + require(run(wrong_stop, before, width) != lanes(after, width), "wrong stop went undetected") + print("PASS_PAIRED_DDG_ARITHMETIC_STEP") + print(f"{len(pairs)} complete forward/inverse transitions; two fault controls") + print(f"{bill[0]} X, {bill[1]} CNOT, {bill[2]} Toffoli; {len(gates)} total gates") + print(f"{bill[3]} temporary Boolean wires plus {PACKET_WIDTH} clean packet backing bits") + + +if __name__ == "__main__": + main() From 71fdb2cf1ec973b5402c4d3c2466864014a1ccda Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Wed, 18 Nov 2026 21:18:30 +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")