From e8832b7fd18458ff82a96e2c9a061e9df66943cc Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Wed, 11 Nov 2026 09:11:38 +0000 Subject: [PATCH 1/2] feat(research): share paired samplers in 21 canonical tables --- research/signed-swap-residue-bank/PROOF.md | 128 ++++++++++++ research/signed-swap-residue-bank/README.md | 107 ++++++++++ .../signed-swap-residue-bank/SOURCES.json | 30 +++ research/signed-swap-residue-bank/TASK.json | 103 ++++++++++ research/signed-swap-residue-bank/VERIFY.json | 37 ++++ research/signed-swap-residue-bank/bank.py | 89 ++++++++ research/signed-swap-residue-bank/verify.py | 193 ++++++++++++++++++ 7 files changed, 687 insertions(+) create mode 100644 research/signed-swap-residue-bank/PROOF.md create mode 100644 research/signed-swap-residue-bank/README.md create mode 100644 research/signed-swap-residue-bank/SOURCES.json create mode 100644 research/signed-swap-residue-bank/TASK.json create mode 100644 research/signed-swap-residue-bank/VERIFY.json create mode 100644 research/signed-swap-residue-bank/bank.py create mode 100644 research/signed-swap-residue-bank/verify.py diff --git a/research/signed-swap-residue-bank/PROOF.md b/research/signed-swap-residue-bank/PROOF.md new file mode 100644 index 0000000000..e79b627806 --- /dev/null +++ b/research/signed-swap-residue-bank/PROOF.md @@ -0,0 +1,128 @@ +# A smaller forward bank by signed exchange + +## Contract and cited input + +Let `1 <= a,b <= 12`. The caller supplies both residues before drawing coins. +It requests two independent Bernoulli outputs with parameters `a/13,b/13`. +Coins are independent fair bits, with no free initial random state. + +zxv's [#6072](https://github.com/CrocSwap/integer-mult-bounds/pull/6072) +supplies the following input theorem. Its fixed-parameter dyadic decision graph +returns labels `00,01,10,11` with weights + +``` +w(a,b) = ((13-a)(13-b), (13-a)b, a(13-b), ab), denominator 169. +``` + +At every depth `k`, the number of completed label-`i` binary prefixes is +`floor(2^k w_i/169)`. This saturates the fair-prefix lower bound and attains the +optimal expected draw count. Its periodic representation has 312 pending states +and four terminal labels, hence 624 nine-bit targets, or 702 bytes. These are +cited predecessor results. The present verification does not rerun its law, +mean catalogue or optimality verifier. + +The new contract permits changing which output a particular coin tape returns. +It retains the requested joint law and, as shown below, the original stopping +time on every coin tape. It is a forward logical contract only. + +## Theorem + +All 144 requested pairs can be served from 21 unchanged canonical source tables, +a 144-byte selector and fixed output logic. Their transition and selector payload +is exactly 14,886 bytes. The resulting sampler has the requested independent +product law, the cited optimal expected draw count, and the original first +stopping depth on every finite or infinite coin tape. + +This is a constructive upper bound. No global minimum ROM size, physical tariff +or reversible implementation is asserted. + +## Canonicalization and the output map + +Put `c=min(a,13-a)`, `d=min(b,13-b)`, and let `u=min(c,d)`, `v=max(c,d)`. +The representatives are exactly `(u,v)` with `1 <= u <= v <= 6`. There are +`6+5+4+3+2+1=21`. Independent complements give four pairs on each diagonal +representative; complement and exchange give eight on each off-diagonal one. +Thus the orbit sizes are six fours and fifteen eights, totaling 144 pairs. +These are precisely the orbits under these specified operations, not a minimum +number of tables under arbitrary sampler redesigns. + +Draw `(U,V)` from the canonical `(u,v)` source table. Exchange its coordinates +when `c>d`, then complement its first coordinate when `a>6` and its second when +`b>6`. Call this bijection `F`. Independent complements and exchange preserve +independence and give the two required parameters. More explicitly, + +``` +w(a,b)[F(i)] = w(u,v)[i] for i=0,1,2,3. +``` + +For each depth `k`, relabelled completed prefix counts therefore equal +`floor(2^k w(a,b)[j]/169)` for every requested label `j`. This proves the full +joint law and transfers the cited depth-optimal expected-bit bound. It uses no +floating point, finite draw cap or assumption about an actual inverse caller. + +## Pointwise stopping times + +Permuting the four weights preserves their residue sum at every binary phase. +It therefore preserves the pending-node counts `n_k` and the total number `D_k` +of terminal children at the next level. The literal source rule orders all +terminal children before the pending children. At node `j` with coin `t`, put +`l=2j+t`. If `l None: + if not condition: + raise ValueError(message) + + +def pair_index(a: int, b: int) -> int: + require(type(a) is int and type(b) is int, "integer residue pair") + require(1 <= a <= 12 and 1 <= b <= 12, "nonzero residue pair") + return (a - 1) * 12 + b - 1 + + +def selector(a: int, b: int) -> int: + _ = pair_index(a, b) # Validate the pair; its input index is not needed here. + left, right = min(a, 13 - a), min(b, 13 - b) + flags = 2 * int(a > 6) + int(b > 6) + if left > right: + left, right = right, left + flags += 4 + return 8 * REPRESENTATIVES.index((left, right)) + flags + + +def output_map(flags: int, output: int) -> int: + require(type(flags) is int and 0 <= flags < 8, "output flags") + require(type(output) is int and 0 <= output < 4, "output label") + left, right = output >> 1, output & 1 + if flags & 4: + left, right = right, left + return 2 * (left ^ ((flags >> 1) & 1)) + (right ^ (flags & 1)) + + +def pack(tables: tuple) -> bytes: + require(len(tables) == 21, "canonical table count") + payload = bytearray(BANK_BYTES) + for a in range(1, 13): + for b in range(1, 13): + payload[pair_index(a, b)] = selector(a, b) + for table_id, table in enumerate(tables): + require(len(table) == STATES, "source state count") + base = SELECTORS + table_id * TABLE_BYTES + for state, row in enumerate(table): + require(len(row) == 2, "binary transition row") + for coin, target in enumerate(row): + require(type(target) is int and 0 <= target < 316, "table target") + position = 9 * (2 * state + coin) + byte, shift = divmod(position, 8) + word = target << shift + payload[base + byte] |= word & 255 + payload[base + byte + 1] |= word >> 8 + return bytes(payload) + + +def transition(payload: bytes, code: int, state: int, coin: int) -> int: + require(type(payload) is bytes and len(payload) == BANK_BYTES, "bank length") + require(type(code) is int and 0 <= code < 168, "selector code") + require(type(state) is int and 0 <= state < STATES, "pending state") + require(type(coin) is int and coin in (0, 1), "binary coin") + table_id, flags = divmod(code, 8) + byte, shift = divmod(9 * (2 * state + coin), 8) + offset = SELECTORS + table_id * TABLE_BYTES + byte + target = ((payload[offset] | (payload[offset + 1] << 8)) >> shift) & 511 + require(target < 316, "packed target") + if target >= STATES: + return STATES + output_map(flags, target - STATES) + return target + + +def run(payload: bytes, a: int, b: int, coins: tuple) -> tuple: + index = pair_index(a, b) + require(type(payload) is bytes and len(payload) == BANK_BYTES, "bank length") + require(type(coins) is tuple and len(coins) <= 4096, "finite tape limit") + require(all(type(coin) is int and coin in (0, 1) for coin in coins), "binary tape") + state, code = 0, payload[index] + for used, coin in enumerate(coins, 1): + state = transition(payload, code, state, coin) + if state >= STATES: + return state - STATES, used + return None, len(coins) diff --git a/research/signed-swap-residue-bank/verify.py b/research/signed-swap-residue-bank/verify.py new file mode 100644 index 0000000000..25484c96b3 --- /dev/null +++ b/research/signed-swap-residue-bank/verify.py @@ -0,0 +1,193 @@ +"""Verify the new selector, packed bank and relabelled paths. Apache-2.0.""" + +import argparse +from collections import Counter, deque +import hashlib +import json +from pathlib import Path +import sys + +sys.path.insert(0, str(Path(__file__).resolve().parent)) +from bank import (BANK_BYTES, REPRESENTATIVES, SELECTORS, STATES, TABLE_BYTES, + output_map, pack, pair_index, require, run, selector, transition) + +HERE = Path(__file__).resolve().parent +ROOT = HERE.parents[1] +MAPS = ((0, 1, 2, 3), (1, 0, 3, 2), (2, 3, 0, 1), (3, 2, 1, 0), + (0, 2, 1, 3), (1, 3, 0, 2), (2, 0, 3, 1), (3, 1, 2, 0)) + + +def source_tables() -> tuple: + """Load authenticated source bytes, bypassing any bytecode cache. + + This fixed, hash-bound module load is the only dynamic-code exception. + Only make() is called; the predecessor's main verifier is never called. + """ + manifest = json.loads((HERE / "SOURCES.json").read_text()) + source = ROOT / "research/paired-residue-sampler/verify.py" + authenticated = {} + for row in manifest["files"]: + if row["usage"] == "input": + raw = (ROOT / row["path"]).read_bytes() + require(hashlib.sha256(raw).hexdigest() == row["sha256"], "source hash") + authenticated[row["path"]] = raw + namespace = {"__file__": str(source), "__name__": "paired_source"} + raw = authenticated["research/paired-residue-sampler/verify.py"] + exec(compile(raw, str(source), "exec"), namespace) + # The inherited weights, depth counts and exact means are not audit targets. + return tuple(namespace["make"](a, b)[2] for a, b in REPRESENTATIVES) + + +def weights(a: int, b: int) -> tuple: + return ((13 - a) * (13 - b), (13 - a) * b, a * (13 - b), a * b) + + +def validate(payload: bytes, tables: tuple) -> dict: + require(type(payload) is bytes and len(payload) == BANK_BYTES, "bank length") + orbits = Counter() + edges = 0 + for a in range(1, 13): + for b in range(1, 13): + code = payload[pair_index(a, b)] + require(code < 168, "selector code") + table_id, flags = divmod(code, 8) + representative = REPRESENTATIVES[table_id] + mapped = [0] * 4 + for label, weight in enumerate(weights(*representative)): + mapped[MAPS[flags][label]] = weight + require(output_map(flags, label) == MAPS[flags][label], "output map") + require(tuple(mapped) == weights(a, b), "selector product law") + orbits[representative] += 1 + for state, row in enumerate(tables[table_id]): + for coin, target in enumerate(row): + expected = target if target < STATES else STATES + MAPS[flags][target - STATES] + require(transition(payload, code, state, coin) == expected, "packed edge") + edges += 1 + require(len(orbits) == 21, "all canonical tables used") + require(Counter(orbits.values()) == {4: 6, 8: 15}, "signed-exchange orbits") + return {"selectors": SELECTORS, "canonical_tables": 21, "checked_edges": edges, + "orbit_size_histogram": {str(k): v for k, v in sorted(Counter(orbits.values()).items())}} + + +def leaf_paths(table: tuple) -> tuple: + """Shortest terminating fixtures. The queue visits at most 312 states.""" + paths = {0: ()} + queue = deque([0]) + leaves = {} + for _ in range(STATES): + if not queue: + break + state = queue.popleft() + for coin, target in enumerate(table[state]): + path = paths[state] + (coin,) + if target >= STATES: + leaves.setdefault(target - STATES, path) + elif target not in paths: + paths[target] = path + queue.append(target) + require(not queue and len(leaves) == 4, "complete fixture traversal") + return tuple(leaves[label] for label in range(4)) + + +def path_checks(payload: bytes, tables: tuple) -> dict: + fixtures = tuple(leaf_paths(table) for table in tables) + cases = 0 + for a in range(1, 13): + for b in range(1, 13): + code = payload[pair_index(a, b)] + table_id, flags = divmod(code, 8) + for label, path in enumerate(fixtures[table_id]): + expected = (MAPS[flags][label], len(path)) + require(run(payload, a, b, path + (0, 1, 0)) == expected, "first stop and label") + require(run(payload, a, b, path[:-1]) == (None, len(path) - 1), "unfinished prefix") + cases += 1 + require(run(payload, a, b, (1,) * 312) == (None, 312), "phase-wrap continuation") + # A seven-step literal source rule illustrates the changed coin-to-label contract. + tape = (1, 1, 1, 1, 1, 0, 0) + residues, node, original = weights(12, 2), 0, None + for used, coin in enumerate(tape, 1): + node = 2 * node + coin + for label, residue in enumerate(residues): + node -= 2 * residue // 169 + if node < 0: + original = label, used + break + if original is not None: + break + residues = tuple(2 * residue % 169 for residue in residues) + require(original == (1, 7), "original label witness") + require(run(payload, 12, 2, tape) == (2, 7), "changed label witness") + return {"terminating_paths": cases, "unfinished_prefixes": cases, + "two_period_continuations": 144, + "changed_function_witness": {"pair": [12, 2], "tape": "1111100", + "original_label": 1, "bank_label": 2, "stopping_depth": 7}} + + +def rejected(operation, reason: str) -> None: + try: + operation() + except ValueError as error: + require(str(error) == reason, "wrong rejection reason") + return + raise ValueError("negative control accepted") + + +def negative_checks(payload: bytes, tables: tuple) -> int: + for a, b in ((0, 1), (13, 1), (True, 1), (1.0, 2)): + reason = "integer residue pair" if type(a) is not int else "nonzero residue pair" + rejected(lambda: selector(a, b), reason) + for flag in (1, 2, 4): + altered = bytearray(payload) + altered[pair_index(1, 2)] ^= flag + rejected(lambda: validate(bytes(altered), tables), "selector product law") + altered = bytearray(payload) + altered[0] = 255 + rejected(lambda: validate(bytes(altered), tables), "selector code") + altered = bytearray(payload) + altered[SELECTORS] ^= 1 + rejected(lambda: validate(bytes(altered), tables), "packed edge") + rejected(lambda: validate(payload[:-1], tables), "bank length") + rejected(lambda: transition(payload, 0, STATES, 0), "pending state") + rejected(lambda: transition(payload, 0, 0, True), "binary coin") + rejected(lambda: run(payload, 1, 1, (0, 2)), "binary tape") + rejected(lambda: run(payload, 1, 1, (1,) * 4097), "finite tape limit") + altered = bytearray(payload) + altered[SELECTORS] = 255 + altered[SELECTORS + 1] |= 1 + rejected(lambda: transition(bytes(altered), 0, 0, 0), "packed target") + return 15 + + +def outside_output(path: str, data: bytes) -> None: + target = Path(path).expanduser().resolve() + require(not target.is_relative_to(ROOT), "output must be outside checkout") + require(target.parent.is_dir(), "output parent exists") + require(target.write_bytes(data) == len(data), "complete output write") + + +def main() -> None: + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--emit-bank") + parser.add_argument("--receipt") + args = parser.parse_args() + tables = source_tables() + payload = pack(tables) + result = {"status": "PASS_SIGNED_SWAP_RESIDUE_BANK", **validate(payload, tables), + **path_checks(payload, tables), "rejection_controls": negative_checks(payload, tables), + "bank_bytes": len(payload), "transition_bytes": 21 * TABLE_BYTES, + "bank_sha256": hashlib.sha256(payload).hexdigest(), + "scope": "new forward logical bank; inherited DDG law and optimum; no physical tariff or kappa"} + result["package_sha256"] = { + path.name: hashlib.sha256(path.read_bytes()).hexdigest() + for path in sorted(HERE.iterdir()) if path.is_file() + } + if args.emit_bank: + outside_output(args.emit_bank, payload) + encoded = (json.dumps(result, indent=2, sort_keys=True) + "\n").encode() + if args.receipt: + outside_output(args.receipt, encoded) + print(encoded.decode(), end="") + + +if __name__ == "__main__": + main() From 5504be187271a90a3a46e497ed2d5b4196c5df8a Mon Sep 17 00:00:00 2001 From: Nick Petalas Date: Tue, 17 Nov 2026 22:26:14 +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")