diff --git a/contract-canary.lock.json b/contract-canary.lock.json index 31641316..eab1789f 100644 --- a/contract-canary.lock.json +++ b/contract-canary.lock.json @@ -45,7 +45,7 @@ }, "cave": { "repository": "OpenCoven/coven-cave", - "revision": "6325fc4c1154c7d7398074a9760a2e2dc323b424", + "revision": "bc310e9753783678014086ed6f7ef7d3fb797967", "artifacts": { "contractFixture": { "path": "src/lib/server/client-v1/contract-fixture.json", diff --git a/docs/phase1-conformance.md b/docs/phase1-conformance.md index 667863ad..ece248f1 100644 --- a/docs/phase1-conformance.md +++ b/docs/phase1-conformance.md @@ -21,8 +21,8 @@ the final bytes. `c373902b48b06520450f520e669a34f72b64a35d`, the frozen SDK source authority; - SDK package candidate `acc38488f00860d246c3c553375634d64806eabb`; -- Cave authority `6325fc4c1154c7d7398074a9760a2e2dc323b424`, tree - `9144939792d3dbdd91c208d7e2abc5ecc0eac089`, release `0.3.12`; +- Cave authority `bc310e9753783678014086ed6f7ef7d3fb797967`, tree + `8a9882f45c7b9f55a2d9bb6cbd16d3ead3c489e6`, release `0.3.12`; - Coven producer/client `721437b84026c042e431b0882dcd14fdb29ac07d`; - Chat conformance driver support at the exact `harness.revision` and `harnessAuthority.tree` generated from the preceding code/integration diff --git a/phase1-conformance.lock.json b/phase1-conformance.lock.json index e0e1f4dc..c8098e9f 100644 --- a/phase1-conformance.lock.json +++ b/phase1-conformance.lock.json @@ -10,7 +10,7 @@ }, "cave": { "repository": "OpenCoven/coven-cave", - "revision": "6325fc4c1154c7d7398074a9760a2e2dc323b424" + "revision": "bc310e9753783678014086ed6f7ef7d3fb797967" }, "coven": { "repository": "OpenCoven/coven", diff --git a/src/contract-canary-artifact-root.test.ts b/src/contract-canary-artifact-root.test.ts index 6292464b..e689fbae 100644 --- a/src/contract-canary-artifact-root.test.ts +++ b/src/contract-canary-artifact-root.test.ts @@ -428,7 +428,7 @@ describe('contract canary temp directory safety', () => { sha256: 'c44544adf8e712d6be1e8686788e63aa0133eb318274d1fb1926138a7da148c0', }); expect(lock.cave.repository).toBe('OpenCoven/coven-cave'); - expect(lock.cave.revision).toBe('6325fc4c1154c7d7398074a9760a2e2dc323b424'); + expect(lock.cave.revision).toBe('bc310e9753783678014086ed6f7ef7d3fb797967'); expect(lock.cave.artifacts).toEqual({ contractFixture: { path: 'src/lib/server/client-v1/contract-fixture.json', @@ -540,12 +540,12 @@ describe('contract canary temp directory safety', () => { }, cave: { repository: 'OpenCoven/coven-cave', - revision: '6325fc4c1154c7d7398074a9760a2e2dc323b424', + revision: 'bc310e9753783678014086ed6f7ef7d3fb797967', }, } satisfies CheckoutHeadsInput; const packedFixtureInput = { cave: { - revision: '6325fc4c1154c7d7398074a9760a2e2dc323b424', + revision: 'bc310e9753783678014086ed6f7ef7d3fb797967', artifacts: { contractFixture: { path: 'src/lib/server/client-v1/contract-fixture.json', @@ -575,7 +575,7 @@ describe('contract canary temp directory safety', () => { const missingFixtureRevision: PackedFixtureInput = { cave: {} }; expect(checkoutHeadsInput.sdk.repository).toBe('OpenCoven/sdk'); - expect(packedFixtureInput.cave.revision).toBe('6325fc4c1154c7d7398074a9760a2e2dc323b424'); + expect(packedFixtureInput.cave.revision).toBe('bc310e9753783678014086ed6f7ef7d3fb797967'); expect(missingCheckoutRevision).toBeDefined(); expect(missingFixtureRevision).toBeDefined(); }); diff --git a/src/phase1-conformance-lock.test.ts b/src/phase1-conformance-lock.test.ts index 898801de..1508b7dd 100644 --- a/src/phase1-conformance-lock.test.ts +++ b/src/phase1-conformance-lock.test.ts @@ -141,7 +141,7 @@ const expectedEntries = { }, cave: { repository: 'OpenCoven/coven-cave', - revision: '6325fc4c1154c7d7398074a9760a2e2dc323b424', + revision: 'bc310e9753783678014086ed6f7ef7d3fb797967', }, coven: { repository: 'OpenCoven/coven', diff --git a/src/phase1-schema-v2-evidence.test.ts b/src/phase1-schema-v2-evidence.test.ts index 027eb19c..8483b4e6 100644 --- a/src/phase1-schema-v2-evidence.test.ts +++ b/src/phase1-schema-v2-evidence.test.ts @@ -31,7 +31,7 @@ import { } from '../scripts/phase1-schema-v2-evidence.mjs'; const projectRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..'); -const sdk933FixtureRoot = resolve(projectRoot, 'src', 'test', 'fixtures', 'sdk-933a9523'); +const sdk933FixtureRoot = resolve(projectRoot, 'src', 'test', 'fixtures', 'sdk-2d1cb15f'); const sdk933LockFixturePath = resolve( sdk933FixtureRoot, 'client-v1-cross-repository-lock.json.fixture', @@ -57,8 +57,8 @@ const validatorTree = validatorAvailable }).trim() : ''; const phase1CompatibilityValidator = { - commit: '933a9523ccbee071417eca01b8a7a37e54d6cbc0', - tree: 'abce229089be13b990d498f343e1392e8f68a039', + commit: '2d1cb15fcb47ff6577ccae1186c74ded69b82fc8', + tree: 'a22efd97c9d0f96f6163147f175a1b0e7cc49de0', } as const; type JsonRecord = Record; @@ -1519,9 +1519,9 @@ describe('Phase 1 SDK source contract authority', () => { revision: phase1CompatibilityValidator.commit, tree: phase1CompatibilityValidator.tree, path: 'conformance/client-v1-cross-repository-lock.json', - blob: '30cc0e68af7e01657b7d3ee096641a1dd05e4ab2', - size: 10641, - sha256: '94e8c7e312ecabc377531f58e01675046a1db9902ad74d9fa64098ebb3987fa1', + blob: '6d52eddefac8221fca882e62bdab1585657787f2', + size: 10942, + sha256: 'd772737cc10cf0bd9b48546afea51b3eaf61336b9e16619f421d0fbf900571b8', }); const frozenLockBytes = readFileSync(sdk933LockFixturePath); @@ -1552,8 +1552,8 @@ describe('Phase 1 SDK source contract authority', () => { expect(frozenLock.evidenceProducer).toMatchObject({ status: 'compatible', repository: 'OpenCoven/chat', - commit: '4dc8f64bb71634a01ee647542dcdafdd0888b4f9', - tree: '915232e3595196de447521d9fca59866aeade956', + commit: 'ada542f731ea1b65dd4e6de94ab7dc28b0551740', + tree: '975de93ac84b0436d381f5e427627f98aaa3dd0a', }); }); }); diff --git a/src/specification-guards.test.ts b/src/specification-guards.test.ts index 3272323e..9ba9510a 100644 --- a/src/specification-guards.test.ts +++ b/src/specification-guards.test.ts @@ -148,7 +148,7 @@ describe('Phase 1 specification guards', () => { expect(lock.sdk.repository).toBe('OpenCoven/sdk'); expect(lock.cave.repository).toBe('OpenCoven/coven-cave'); expect(lock.sdk.revision).toBe('acc38488f00860d246c3c553375634d64806eabb'); - expect(lock.cave.revision).toBe('6325fc4c1154c7d7398074a9760a2e2dc323b424'); + expect(lock.cave.revision).toBe('bc310e9753783678014086ed6f7ef7d3fb797967'); expect(lock.sdk.releaseManifest).toEqual({ file: 'release-manifest.json', version: '0.1.0', diff --git a/src/test/fixtures/sdk-933a9523/client-v1-cross-repository-lock.json.fixture b/src/test/fixtures/sdk-2d1cb15f/client-v1-cross-repository-lock.json.fixture similarity index 84% rename from src/test/fixtures/sdk-933a9523/client-v1-cross-repository-lock.json.fixture rename to src/test/fixtures/sdk-2d1cb15f/client-v1-cross-repository-lock.json.fixture index 30cc0e68..6d52edde 100644 --- a/src/test/fixtures/sdk-933a9523/client-v1-cross-repository-lock.json.fixture +++ b/src/test/fixtures/sdk-2d1cb15f/client-v1-cross-repository-lock.json.fixture @@ -11,7 +11,7 @@ "path": "conformance/client-v1-cross-repository-evidence.schema.json", "version": 2, "size": 23174, - "sha256": "f9d58f4daee3f8a6fbf78650a18a74ed3ac14c39f1ae086d94324658d7fbdfad" + "sha256": "2581b0976ba655e238d98322adb81ddfa3bc0a251e25d49fb888fa4726435471" }, "candidate": { "repository": "OpenCoven/sdk", @@ -88,8 +88,8 @@ "sources": { "cave": { "repository": "OpenCoven/coven-cave", - "commit": "6325fc4c1154c7d7398074a9760a2e2dc323b424", - "tree": "9144939792d3dbdd91c208d7e2abc5ecc0eac089", + "commit": "bc310e9753783678014086ed6f7ef7d3fb797967", + "tree": "8a9882f45c7b9f55a2d9bb6cbd16d3ead3c489e6", "releaseVersion": "0.3.12", "files": [ { @@ -165,26 +165,26 @@ "evidenceProducer": { "status": "compatible", "repository": "OpenCoven/chat", - "commit": "4dc8f64bb71634a01ee647542dcdafdd0888b4f9", - "tree": "915232e3595196de447521d9fca59866aeade956", + "commit": "ada542f731ea1b65dd4e6de94ab7dc28b0551740", + "tree": "975de93ac84b0436d381f5e427627f98aaa3dd0a", "packageManifest": { "path": "package.json", - "size": 3849, - "sha256": "cff1008b666d3381ad1a68fc99a9334bab04d617efb7e0ea434428af3ac8603a" + "size": 4044, + "sha256": "ed23998109c7762c18120ecbe31ef517f24ab7a1630239e0ca65a56112aa619b" }, "harness": { "path": "scripts/phase1-conformance.mjs", "version": "2.0.0", - "size": 187131, - "sha256": "cc374d616d9de0a0cd94ce2ced5847fd877e124323acce3fca31f3df35d67d1b" + "size": 199944, + "sha256": "67ba91257a71c36c7d91ef01796c5a348d106e40b4a6f1ef59fde6980a5ba584" }, "command": "test:phase1-conformance", "recordSchemaVersion": 2, "workflow": { "name": "client-v1 conformance", "path": ".github/workflows/client-v1-conformance.yml", - "size": 443639, - "sha256": "d4e4029cf667026463b63eed2a2965f1e9f8c0c34b4b2d796afbbacfc00d2042", + "size": 463033, + "sha256": "e76c4361fb94c0b9525680f2aac176ca377174665b0323b5aefaf219fa452d02", "job": "platform-conformance", "jobNameTemplate": "platform-conformance ({platform})", "aggregationJob": "aggregate-conformance", @@ -219,13 +219,19 @@ ], "downloadArtifactAction": "actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c", "attestationAction": "actions/attest-build-provenance@4d101475d8b20a2381f78447822ac1eab6504dd8", - "windowsBootstrapScriptSha256": "d237986c4370f42b32347be9eeb9c33e09c1f3c87f80563b3f11ec17053b91c7", + "windowsBootstrapScriptSha256": "d9572f970962a3eb24e0fa307b65578a7722eda902b59af8b268b03d83537a43", "validatorRevisionScriptSha256": "9abbfe73f19e47650321e6afb2c2a7db4facbf05a72db30241dfa94261cdcad9", "phase1RevisionsScriptSha256": "507ce777b643d97154472eb23135f7965fd55cf0fcedcec30e93b23e6472d225", - "linuxKeyringSetupScriptSha256": "26e6bb6da4d80617c99d6edeb577c2026910ffc3b1ee70df03bed5fb8d149a51", - "unixSupervisorPreparationScriptSha256": "20748878d28293006178804f3a2075b69eab7a98f88a49028e238069e30d8b11", - "unixProductionScriptSha256": "1cbfaf8420970fc488424021dae04136891966fcce9a5a7493fe431a23376aa2", - "unixValidationScriptSha256": "b0ce7139bdf365d420c7dde478282f117cce97c1bec63d07cd95b64057121a89", + "linuxKeyringSetupScriptSha256": "7b1ff87ab5d2230950632560230899cc450458a800a630c2788b53be8b13d200", + "unixSupervisorPreparationScriptSha256": "019a8570d1d16ab896a56a08b446978f0e9d8ddd7daee274e3f1747a56192b5e", + "unixToolPathSource": { + "path": "scripts/executable-resolution.mjs", + "size": 9154, + "sha256": "31e3c412ff8c835f14522f36a59e91f4a4ba82913210ae8e3b4455217503f430" + }, + "unixToolPathScriptSha256": "72ddd8865c68c5dde15d08decb771914d903f752d4909a52d1a10440eaadf36e", + "unixProductionScriptSha256": "043066be50d0c3fa66f7151224242734cb2e9f39ffa9cf1c6f8106ab88c75a02", + "unixValidationScriptSha256": "51d1402febcbcf9e5b117bdbc3ee2123a68d5ec6f560af5e629b727e7eb7b7bf", "validationGuardScriptSha256": "9abbfe73f19e47650321e6afb2c2a7db4facbf05a72db30241dfa94261cdcad9", "validationScriptSha256": "72a2c0810c535d4e3d5e2b0c76bfc1822dc43d54ee653bb034fb977125dbd734", "attestationScriptSha256": "24af6732396013e8c1f23404cf38b5332e5a276c034d530c80d02247cb2a7347", @@ -243,8 +249,8 @@ ] }, "signerWorkflow": "OpenCoven/chat/.github/workflows/client-v1-conformance.yml", - "signerDigest": "4dc8f64bb71634a01ee647542dcdafdd0888b4f9", - "sourceDigest": "4dc8f64bb71634a01ee647542dcdafdd0888b4f9", + "signerDigest": "ada542f731ea1b65dd4e6de94ab7dc28b0551740", + "sourceDigest": "ada542f731ea1b65dd4e6de94ab7dc28b0551740", "predicateType": "https://slsa.dev/provenance/v1", "denySelfHostedRunners": true } @@ -268,6 +274,6 @@ "assertionRegistry": { "path": "conformance/client-v1-cross-repository-assertions.json", "size": 10715, - "sha256": "6d5619033469f81a5d40f4fa4b5000708922da29b2eb7a76e4a4db4dfff198cb" + "sha256": "0f8df49a870b7beaac81bc417c072d7f77c1e8a7c2c4ab1241dffe5cd757bbb1" } } diff --git a/src/test/fixtures/sdk-2d1cb15f/client-v1-cross-repository-lock.provenance.json b/src/test/fixtures/sdk-2d1cb15f/client-v1-cross-repository-lock.provenance.json new file mode 100644 index 00000000..f47f8033 --- /dev/null +++ b/src/test/fixtures/sdk-2d1cb15f/client-v1-cross-repository-lock.provenance.json @@ -0,0 +1,9 @@ +{ + "repository": "OpenCoven/sdk", + "revision": "2d1cb15fcb47ff6577ccae1186c74ded69b82fc8", + "tree": "a22efd97c9d0f96f6163147f175a1b0e7cc49de0", + "path": "conformance/client-v1-cross-repository-lock.json", + "blob": "6d52eddefac8221fca882e62bdab1585657787f2", + "size": 10942, + "sha256": "d772737cc10cf0bd9b48546afea51b3eaf61336b9e16619f421d0fbf900571b8" +} diff --git a/src/test/fixtures/sdk-933a9523/client-v1-cross-repository-lock.provenance.json b/src/test/fixtures/sdk-933a9523/client-v1-cross-repository-lock.provenance.json deleted file mode 100644 index 3c3c8da0..00000000 --- a/src/test/fixtures/sdk-933a9523/client-v1-cross-repository-lock.provenance.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "repository": "OpenCoven/sdk", - "revision": "933a9523ccbee071417eca01b8a7a37e54d6cbc0", - "tree": "abce229089be13b990d498f343e1392e8f68a039", - "path": "conformance/client-v1-cross-repository-lock.json", - "blob": "30cc0e68af7e01657b7d3ee096641a1dd05e4ab2", - "size": 10641, - "sha256": "94e8c7e312ecabc377531f58e01675046a1db9902ad74d9fa64098ebb3987fa1" -}