commit 5f511c28ffe26ec7af80ba5ce9a875dcc402f55c parent 34463eb756c626cf2f8e0ae78566c920e3f03239 Author: triesap <tyson@radroots.org> Date: Sat, 10 Oct 2026 20:41:14 +0000 build: require Rust 1.99.0 for HarvestCircle - Pin active Cargo, Kotlin, oracle and Linux verification to Rust 1.99.0. - Refresh interop provenance through real pinned Rust producers. - Adopt equivalent current slice and atomic APIs without suppressing warnings. - Preserve browser WIP and remove outer oracle compilation cutoffs. Diffstat:
28 files changed, 722 insertions(+), 208 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -30,7 +30,7 @@ Food/Message interop and real extension/relay qualification remain pending. Run commands from this checkout's root, including when the path contains spaces; from elsewhere use `make -C "/path/to/HarvestCircle" <target>`. -Native commands require Rust 1.97.1, the pinned JDK/Gradle wrapper and the +Native commands require Rust 1.99.0, the pinned JDK/Gradle wrapper and the supported host's native prerequisites described in README. They do not require Node or pnpm. Browser commands require the pinned Node/Corepack/pnpm inputs, Make and ordinary shell/Git utilities; they do not require Rust, Java or Gradle diff --git a/Makefile b/Makefile @@ -1,7 +1,7 @@ .DEFAULT_GOAL := help GRADLE ?= ./gradlew -override CARGO := cargo +1.97.1 +override CARGO := cargo +1.99.0 CARGO_MANIFEST := core/Cargo.toml XTASK_MANIFEST := tools/xtask/Cargo.toml BUILD_MODE ?= standalone @@ -196,7 +196,7 @@ governed-source-check: package-check: export HARVESTCIRCLE_BUILD_SOURCE_COMMIT = $(shell git rev-parse --verify HEAD) package-check: export HARVESTCIRCLE_BUILD_SOURCE_DIRTY = $(if $(strip $(shell git status --porcelain --untracked-files=all)),true,false) package-check: export HARVESTCIRCLE_BUILD_RADROOTS_REVISION = $(shell sed -n 's/^revision = "\([0-9a-f]\{40\}\)"$$/\1/p' radroots.lib.source-lock.v1.toml) -package-check: export HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN = 1.97.1 +package-check: export HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN = 1.99.0 package-check: export SOURCE_DATE_EPOCH = $(shell git show -s --format=%ct HEAD) package-check: source-check $(BUILD_RUNNER) $(GRADLE) --no-daemon --no-parallel --no-configuration-cache :app:desktop:unsignedReleaseReadiness @@ -210,7 +210,7 @@ governed-integration-check: development-check: export HARVESTCIRCLE_BUILD_SOURCE_COMMIT = $(shell git rev-parse --verify HEAD) development-check: export HARVESTCIRCLE_BUILD_SOURCE_DIRTY = $(if $(strip $(shell git status --porcelain --untracked-files=all)),true,false) development-check: export HARVESTCIRCLE_BUILD_RADROOTS_REVISION = $(shell sed -n 's/^revision = "\([0-9a-f]\{40\}\)"$$/\1/p' radroots.lib.source-lock.v1.toml) -development-check: export HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN = 1.97.1 +development-check: export HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN = 1.99.0 development-check: export SOURCE_DATE_EPOCH = $(shell git show -s --format=%ct HEAD) development-check: development-provenance-check source-check integration-check @@ -237,7 +237,7 @@ unsigned-release-check: _unsigned-release-check: export HARVESTCIRCLE_BUILD_SOURCE_COMMIT = $(shell git rev-parse --verify HEAD) _unsigned-release-check: export HARVESTCIRCLE_BUILD_SOURCE_DIRTY = $(if $(strip $(shell git status --porcelain --untracked-files=all)),true,false) _unsigned-release-check: export HARVESTCIRCLE_BUILD_RADROOTS_REVISION = $(shell sed -n 's/^revision = "\([0-9a-f]\{40\}\)"$$/\1/p' radroots.lib.source-lock.v1.toml) -_unsigned-release-check: export HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN = 1.97.1 +_unsigned-release-check: export HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN = 1.99.0 _unsigned-release-check: export SOURCE_DATE_EPOCH = $(shell git show -s --format=%ct HEAD) _unsigned-release-check: doctor @test "$(BUILD_MODE)" = governed || { printf '%s\n' 'unsigned-release-check requires governed mode'; exit 2; } diff --git a/README.md b/README.md @@ -60,7 +60,7 @@ Controlled browser tests remain separate web package scripts requiring a qualified Playwright browser. Browser commands use the web directory before Corepack resolves its package manager; no root JavaScript workspace is added. -Native prerequisites include JDK 21, Rust 1.97.1, and platform packaging tools. +Native prerequisites include JDK 21, Rust 1.99.0, and platform packaging tools. Node is not a native prerequisite. The `native-*` targets are recipe-free aliases of the existing native targets: diff --git a/build-logic/plugins/src/main/kotlin/org/harvestcircle/buildlogic/plugins/HarvestCircleRustFfiPlugin.kt b/build-logic/plugins/src/main/kotlin/org/harvestcircle/buildlogic/plugins/HarvestCircleRustFfiPlugin.kt @@ -74,7 +74,7 @@ public class HarvestCircleRustFfiPlugin : Plugin<Project> { val radrootsRevision = target.providers.environmentVariable(productEnvironment("BUILD_RADROOTS_REVISION")).orElse("unknown") val rustToolchain = - target.providers.environmentVariable(productEnvironment("BUILD_RUST_TOOLCHAIN")).orElse("1.97.1") + target.providers.environmentVariable(productEnvironment("BUILD_RUST_TOOLCHAIN")).orElse("1.99.0") val javaToolchain = target.providers.environmentVariable(productEnvironment("BUILD_JAVA_TOOLCHAIN")).orElse(System.getProperty("java.version")) val kotlinToolchain = diff --git a/build-logic/plugins/src/main/kotlin/org/harvestcircle/buildlogic/plugins/tasks/VerificationLanes.kt b/build-logic/plugins/src/main/kotlin/org/harvestcircle/buildlogic/plugins/tasks/VerificationLanes.kt @@ -64,7 +64,7 @@ object VerificationLanes { } fun verifyDevelopmentMakefile(source: String) { - check(source.lineSequence().count { it == "override CARGO := cargo +1.97.1" } == 1) { + check(source.lineSequence().count { it == "override CARGO := cargo +1.99.0" } == 1) { "Development verification must pin the exact Rust toolchain" } val exactTargetHeaders = diff --git a/build-logic/plugins/src/test/kotlin/org/harvestcircle/buildlogic/plugins/tasks/VerificationLanesTest.kt b/build-logic/plugins/src/test/kotlin/org/harvestcircle/buildlogic/plugins/tasks/VerificationLanesTest.kt @@ -37,6 +37,12 @@ class VerificationLanesTest { VerificationLanes.verifyDevelopmentMakefile(makefile) assertFails { + VerificationLanes.verifyDevelopmentMakefile(makefile.replace("+1.99.0", "+1.97.1")) + } + assertFails { + VerificationLanes.verifyDevelopmentMakefile(makefile.replace("+1.99.0", "+1.98.0")) + } + assertFails { VerificationLanes.verifyDevelopmentMakefile( makefile.replace( "development-check: development-provenance-check source-check integration-check", @@ -77,7 +83,7 @@ class VerificationLanesTest { private val makefile = """ - override CARGO := cargo +1.97.1 + override CARGO := cargo +1.99.0 source-check: build-logic-check check bindings api-check licenses dev-check diff --git a/contracts/interop/food_availability/oracle/Cargo.toml b/contracts/interop/food_availability/oracle/Cargo.toml @@ -2,7 +2,7 @@ name = "harvestcircle_food_fixture_oracle" version = "0.0.0" edition = "2024" -rust-version = "1.97.1" +rust-version = "1.99.0" license = "GPL-3.0-only" publish = false diff --git a/contracts/interop/food_availability/oracle/rust-toolchain.toml b/contracts/interop/food_availability/oracle/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.97.1" +channel = "1.99.0" components = ["clippy", "rustfmt"] profile = "minimal" diff --git a/contracts/interop/food_availability/provenance.v1.json b/contracts/interop/food_availability/provenance.v1.json @@ -19,11 +19,11 @@ }, "producer": { "package": "harvestcircle_food_fixture_oracle", - "rust_toolchain": "1.97.1", + "rust_toolchain": "1.99.0", "files": [ { "path": "oracle/Cargo.toml", - "sha256": "5a9a3891ab81af1b82c3f7fb054f25019b41390d84348466993fb158ddc183fe", + "sha256": "09c93aea3f1714e9a44a1acbb7afad9300b4c9e5d54ed2ef90637bb39331cdc8", "bytes": 693 }, { @@ -33,7 +33,7 @@ }, { "path": "oracle/rust-toolchain.toml", - "sha256": "279d77167cec5426fa80f457cd066dc74a360fbe4e2816f4f3fa01487a918fdc", + "sha256": "065388cb682c606d7f02487e70f150afccd2326949c4c6247a9fc59f2334fe05", "bytes": 86 }, { @@ -155,5 +155,5 @@ "revision_cases": 9 }, "key_policy": "No private key input, generation, signing or persistence; existing public signed vectors verified by pinned Rust and Applesauce", - "qualification_scope": "Shared contract corpus only. Public image fixture semantics are not a prototype image pipeline; prototype outgoing images remain absent. TS Food adapters/template and bidirectional runtime consumer acceptance belong to HCP023\u2013026. No real relay/extension/operator/client/deployment/native qualification." + "qualification_scope": "Shared contract corpus only. Public image fixture semantics are not a prototype image pipeline; prototype outgoing images remain absent. TS Food adapters/template and bidirectional runtime consumer acceptance belong to HCP023–026. No real relay/extension/operator/client/deployment/native qualification." } diff --git a/contracts/interop/manifest.json b/contracts/interop/manifest.json @@ -19,8 +19,8 @@ }, { "path": "contracts/interop/food_availability/provenance.v1.json", - "sha256": "4de4a1c7dade633562599cefdabb96993b6b830bb5acd92c9b74c112cbc2c03e", - "bytes": 6756 + "sha256": "ae0ee1ff898a6cc9da3a89fd56d2340bff54297995e5c6add2b9e0f5d20e3f0d", + "bytes": 6753 }, { "path": "contracts/interop/food_availability/oracle/src/main.rs", @@ -29,7 +29,7 @@ }, { "path": "contracts/interop/food_availability/oracle/Cargo.toml", - "sha256": "5a9a3891ab81af1b82c3f7fb054f25019b41390d84348466993fb158ddc183fe", + "sha256": "09c93aea3f1714e9a44a1acbb7afad9300b4c9e5d54ed2ef90637bb39331cdc8", "bytes": 693 }, { @@ -39,8 +39,8 @@ }, { "path": "web/tests/conformance/food-writer-rust.v1.json", - "sha256": "6c95f997724ee995861c2402c57f6ab29b5facd12aa15097822592993b9bfe19", - "bytes": 29382 + "sha256": "4978ddc6c1cf3aeeeabb643f5b5d94a57cff292687ab3a676cdf7e74e88e2aa7", + "bytes": 35738 }, { "path": "contracts/interop/food_availability/web_templates.v1.json", diff --git a/contracts/interop/message/oracle/Cargo.toml b/contracts/interop/message/oracle/Cargo.toml @@ -2,7 +2,7 @@ name = "harvestcircle_message_fixture_oracle" version = "0.0.0" edition = "2024" -rust-version = "1.97.1" +rust-version = "1.99.0" license = "GPL-3.0-only" publish = false diff --git a/contracts/interop/message/provenance.v1.json b/contracts/interop/message/provenance.v1.json @@ -4,7 +4,7 @@ "inputs": { "source_profile.v1.json": "bff36b4941decca5471389e0155fb6b4027dac485c3e547be05743a936b5bc5f", "corpus.v1.json": "27fb61b7d06133f6cf42456c0582d1246222755da80e034fa1a4f0c9e1669e19", - "oracle/Cargo.toml": "7e0a9804162dc5b52ca61e737df7d91cb50217b2167c7368ad0e69efc9dfab99", + "oracle/Cargo.toml": "11b7723cf9c13136a6eaecfdab1e0a4325ed1adfc2c27e7371e8f9b772992c1a", "oracle/Cargo.lock": "5c81a47d5b34ac7f16d2e118c8614f3e89b47abccec9818fceb9491132e2adc3", "oracle/src/main.rs": "290247c9151fb2490dc108a974eae7fe8633d085ee2d22c6aecbfb15306cd611" }, diff --git a/core/Cargo.toml b/core/Cargo.toml @@ -15,7 +15,7 @@ resolver = "3" [workspace.package] version = "0.1.0-alpha" edition = "2024" -rust-version = "1.97.1" +rust-version = "1.99.0" license = "GPL-3.0-only" repository = "https://github.com/radrootslabs/harvestcircle" homepage = "https://radroots.org" diff --git a/core/crates/harvestcircle_domain/src/availability/query.rs b/core/crates/harvestcircle_domain/src/availability/query.rs @@ -440,7 +440,7 @@ fn decode_hex<const N: usize>(input: &[u8]) -> Result<[u8; N], AvailabilityQuery return Err(AvailabilityQueryError::InvalidInput); } let mut result = [0; N]; - for (output, pair) in result.iter_mut().zip(input.chunks_exact(2)) { + for (output, pair) in result.iter_mut().zip(input.as_chunks::<2>().0) { *output = (hex_digit(pair[0])? << 4) | hex_digit(pair[1])?; } Ok(result) diff --git a/core/crates/harvestcircle_ffi/build.rs b/core/crates/harvestcircle_ffi/build.rs @@ -125,7 +125,7 @@ fn main() { ( "HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN", "HARVESTCIRCLE_BUILD_RUST_TOOLCHAIN", - "1.97.1", + "1.99.0", ), ( "HARVESTCIRCLE_BUILD_JAVA_TOOLCHAIN", diff --git a/core/crates/harvestcircle_nostr/src/client.rs b/core/crates/harvestcircle_nostr/src/client.rs @@ -40,7 +40,7 @@ impl SdkNostrClient { fn request_id(&self) -> Result<String, SafeError> { let sequence = self .next_request - .fetch_update(Ordering::AcqRel, Ordering::Acquire, |value| { + .try_update(Ordering::AcqRel, Ordering::Acquire, |value| { value.checked_add(1) }) .map_err(|_| relay_connection_failed())?; diff --git a/core/rust-toolchain.toml b/core/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.97.1" +channel = "1.99.0" components = ["clippy", "rustfmt"] profile = "minimal" diff --git a/tools/check-all.sh b/tools/check-all.sh @@ -15,7 +15,7 @@ done java_major=$(java -version 2>&1 | sed -n 's/.*version "\([0-9]*\).*/\1/p' | head -n 1) [ "$java_major" = 21 ] || fail "selected JDK must be 21; install/select it explicitly" # Preflight before any consumer. Neither rustup run nor offline Corepack installs. -rustup run 1.97.1 cargo --version +rustup run 1.99.0 cargo --version # Refuse a wrapper download when its selected distribution is not installed. gradle_version=$(sed -n 's@^distributionUrl=.*\/gradle-\([0-9.]*\)-bin.zip$@\1@p' gradle/wrapper/gradle-wrapper.properties) [ -n "$gradle_version" ] || fail "unrecognized pinned Gradle distribution" diff --git a/tools/check-interop.sh b/tools/check-interop.sh @@ -10,8 +10,8 @@ done cd "$repository_root/web" node tools/doctor.mjs cd "$repository_root" -cargo +1.97.1 --version -cargo +1.97.1 test --manifest-path contracts/interop/food_availability/oracle/Cargo.toml --locked --test native_manifest -- --nocapture +cargo +1.99.0 --version +cargo +1.99.0 test --manifest-path contracts/interop/food_availability/oracle/Cargo.toml --locked --test native_manifest -- --nocapture cd "$repository_root/web" corepack pnpm exec node --test tests/conformance/interop-consumer.test.ts printf '%s\n' 'harvestcircle.interop.fixture_consumers=pass' 'harvestcircle.interop.qualification=source_only_no_Message_or_deployed_Tera_claim' diff --git a/tools/run-linux-x86_64-development-check.sh b/tools/run-linux-x86_64-development-check.sh @@ -68,7 +68,7 @@ git -C "$workspace/source" checkout --detach "$source_commit" [ -z "$(git -C "$workspace/source" status --porcelain --untracked-files=all)" ] || fail "isolated source clone is not clean" -runner_image="docker.io/library/rust:1.97.1-slim-trixie@sha256:fc0648ac2962539be80bd424729a20fd80f7b64bfba7e90bbd642aed6c697c5a" +runner_image="docker.io/library/rust:1.99.0-slim-trixie@sha256:2752b332db73fdbb7dc576f06c82ed1f312005784ef913d7e04a28f5f55dc581" docker run \ --rm \ @@ -118,7 +118,7 @@ docker run \ [ "$(uname -m)" = x86_64 ] [ "$(git rev-parse HEAD)" = "$HARVESTCIRCLE_BUILD_SOURCE_COMMIT" ] [ -z "$(git status --porcelain --untracked-files=all)" ] - rustc --version | grep -Eq "^rustc 1\\.97\\.1 " + rustc --version | grep -Eq "^rustc 1\\.99\\.0 " java -version 2>&1 | grep -Eq "version \"21\\." rustup component add clippy rustfmt if ! cargo deny --version 2>/dev/null | grep -Eq "0\\.19\\.8$"; then diff --git a/tools/test-build-modes.sh b/tools/test-build-modes.sh @@ -10,7 +10,7 @@ cleanup() { } trap cleanup EXIT HUP INT TERM -printf '%s\n' '#!/bin/sh' 'if [ "${1:-}" = +1.97.1 ]; then shift; fi' 'if [ "${1:-}" = extbuild ]; then printf "%s\n" "cargo-extbuild unavailable" >&2; else printf "%s\n" "cargo must not be invoked in standalone dry-run" >&2; fi' 'exit 93' > "$fixture/cargo" +printf '%s\n' '#!/bin/sh' 'if [ "${1:-}" = +1.99.0 ]; then shift; fi' 'if [ "${1:-}" = extbuild ]; then printf "%s\n" "cargo-extbuild unavailable" >&2; else printf "%s\n" "cargo must not be invoked in standalone dry-run" >&2; fi' 'exit 93' > "$fixture/cargo" chmod +x "$fixture/cargo" standalone_output=$(PATH="$fixture:$PATH" "$make_command" --no-print-directory -n BUILD_MODE=standalone -C "$repository_root" check) @@ -189,7 +189,7 @@ case "$tool" in ;; npm|pnpm|npx) exit 94 ;; cargo) - if [ "${1:-}" = +1.97.1 ]; then shift; fi + if [ "${1:-}" = +1.99.0 ]; then shift; fi if [ "${1:-}" = extbuild ]; then case "${2:-}" in doctor) exit 0 ;; @@ -346,7 +346,7 @@ for mode in standalone governed; do } $1 == "cargo" { if (mode == "governed" && $3 == "no") { - if ($2 == root && $8 == "+1.97.1" && $9 == "extbuild" && $10 == "doctor" && NF == 10) next + if ($2 == root && $8 == "+1.99.0" && $9 == "extbuild" && $10 == "doctor" && NF == 10) next if ($2 == root "/web" && $8 == "extbuild" && $9 == "run" && $10 == "--" && ($11 == "node" || $11 == "corepack")) next } print "web dispatch invoked unexpected Cargo argv or routing"; exit 1 diff --git a/tools/xtask/Cargo.toml b/tools/xtask/Cargo.toml @@ -2,7 +2,7 @@ name = "harvestcircle_xtask" version = "0.1.0-alpha" edition = "2024" -rust-version = "1.97.1" +rust-version = "1.99.0" license = "GPL-3.0-only" publish = false diff --git a/tools/xtask/src/affected.rs b/tools/xtask/src/affected.rs @@ -490,12 +490,12 @@ fn fingerprint( json!(tool( root, "rustup", - &["run", "1.97.1", "cargo", "--version"] + &["run", "1.99.0", "cargo", "--version"] )), ); tools.insert( "rustc".to_owned(), - json!(tool(root, "rustup", &["run", "1.97.1", "rustc", "-vV"])), + json!(tool(root, "rustup", &["run", "1.99.0", "rustc", "-vV"])), ); tools.insert("java".to_owned(), json!(tool(root, "java", &["-version"]))); // Only invoke an already cached distribution, never a downloading wrapper. diff --git a/tools/xtask/src/lib.rs b/tools/xtask/src/lib.rs @@ -1308,7 +1308,7 @@ fn sqlite_dependency_topology(root: &Path, inventory: &Inventory, findings: &mut fn development_integration_policy(root: &Path, findings: &mut Vec<String>) { let makefile = read_text(root, "Makefile", findings); for required in [ - "override CARGO := cargo +1.97.1", + "override CARGO := cargo +1.99.0", "api-check: doctor", "development-check: development-provenance-check source-check integration-check", "governed-development-check:", @@ -1332,7 +1332,7 @@ fn development_integration_policy(root: &Path, findings: &mut Vec<String>) { findings, ); for required in [ - "rust:1.97.1-slim-trixie@sha256:fc0648ac2962539be80bd424729a20fd80f7b64bfba7e90bbd642aed6c697c5a", + "rust:1.99.0-slim-trixie@sha256:2752b332db73fdbb7dc576f06c82ed1f312005784ef913d7e04a28f5f55dc581", "--platform linux/amd64", "EXT_BUILD_RUN_ACTIVE", "--env JAVA_TOOL_OPTIONS=-Duser.home=/workspace/home", @@ -2445,7 +2445,7 @@ mod tests { write( &root, "Makefile", - "override CARGO := cargo +1.97.1\napi-check: doctor\ndevelopment-check: development-provenance-check source-check integration-check\ngoverned-development-check:\ngoverned-linux-x86_64-development-check: governed-doctor\n", + "override CARGO := cargo +1.99.0\napi-check: doctor\ndevelopment-check: development-provenance-check source-check integration-check\ngoverned-development-check:\ngoverned-linux-x86_64-development-check: governed-doctor\n", ); write( &root, diff --git a/web/tests/conformance/food-corpus.test.ts b/web/tests/conformance/food-corpus.test.ts @@ -86,7 +86,7 @@ void test('public Food corpus and isolated producer retain exact pinned byte pro assert.equal(provenance.corpus.path, 'corpus.v1.json'); assert.equal(provenance.corpus.sha256, digest(corpusBytes)); assert.equal(provenance.corpus.bytes, corpusBytes.length); - assert.equal(provenance.producer.rust_toolchain, '1.97.1'); + assert.equal(provenance.producer.rust_toolchain, '1.99.0'); assert.deepEqual(provenance.producer.files.map((row) => row.path).sort(), [ 'oracle/Cargo.lock', 'oracle/Cargo.toml', diff --git a/web/tests/conformance/food-writer-rust.v1.json b/web/tests/conformance/food-writer-rust.v1.json @@ -7,7 +7,7 @@ "inputs": { "corpus.v1.json": "a8d23bf128facbb0752c8b78c826ff765ac033d66ab9d29609aba9940ad7b682", "source_profile.v1.json": "dede1eb1f682ecd548e8cd3ccb251d298762e504e2588a73528e5f7a5b9eff21", - "provenance.v1.json": "4de4a1c7dade633562599cefdabb96993b6b830bb5acd92c9b74c112cbc2c03e", + "provenance.v1.json": "ae0ee1ff898a6cc9da3a89fd56d2340bff54297995e5c6add2b9e0f5d20e3f0d", "oracle/src/main.rs": "fd2ea8f79c72c17a682e9f27fe020e91933475c2a7218937da60fbb2d42e2432" }, "result": { @@ -22,15 +22,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-g"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "g"], - ["radroots:quantity", "10", "g"], - ["status", "active"] + [ + "d", + "writer-g" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "g" + ], + [ + "radroots:quantity", + "10", + "g" + ], + [ + "status", + "active" + ] ] } }, @@ -41,15 +70,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-kg"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "kg"], - ["radroots:quantity", "10", "kg"], - ["status", "active"] + [ + "d", + "writer-kg" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "kg" + ], + [ + "radroots:quantity", + "10", + "kg" + ], + [ + "status", + "active" + ] ] } }, @@ -60,15 +118,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-lb"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "lb"], - ["radroots:quantity", "10", "lb"], - ["status", "active"] + [ + "d", + "writer-lb" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "lb" + ], + [ + "radroots:quantity", + "10", + "lb" + ], + [ + "status", + "active" + ] ] } }, @@ -79,15 +166,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-oz"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "oz"], - ["radroots:quantity", "10", "oz"], - ["status", "active"] + [ + "d", + "writer-oz" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "oz" + ], + [ + "radroots:quantity", + "10", + "oz" + ], + [ + "status", + "active" + ] ] } }, @@ -98,15 +214,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-each"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "each"], - ["radroots:quantity", "10", "each"], - ["status", "active"] + [ + "d", + "writer-each" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "each" + ], + [ + "radroots:quantity", + "10", + "each" + ], + [ + "status", + "active" + ] ] } }, @@ -117,15 +262,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-dozen"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "dozen"], - ["radroots:quantity", "10", "dozen"], - ["status", "active"] + [ + "d", + "writer-dozen" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "dozen" + ], + [ + "radroots:quantity", + "10", + "dozen" + ], + [ + "status", + "active" + ] ] } }, @@ -136,15 +310,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-bunch"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "bunch"], - ["radroots:quantity", "10", "bunch"], - ["status", "active"] + [ + "d", + "writer-bunch" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "bunch" + ], + [ + "radroots:quantity", + "10", + "bunch" + ], + [ + "status", + "active" + ] ] } }, @@ -155,15 +358,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-punnet"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "punnet"], - ["radroots:quantity", "10", "punnet"], - ["status", "active"] + [ + "d", + "writer-punnet" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "punnet" + ], + [ + "radroots:quantity", + "10", + "punnet" + ], + [ + "status", + "active" + ] ] } }, @@ -174,15 +406,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-bag"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "bag"], - ["radroots:quantity", "10", "bag"], - ["status", "active"] + [ + "d", + "writer-bag" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "bag" + ], + [ + "radroots:quantity", + "10", + "bag" + ], + [ + "status", + "active" + ] ] } }, @@ -193,15 +454,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-basket"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "basket"], - ["radroots:quantity", "10", "basket"], - ["status", "active"] + [ + "d", + "writer-basket" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "basket" + ], + [ + "radroots:quantity", + "10", + "basket" + ], + [ + "status", + "active" + ] ] } }, @@ -212,14 +502,39 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-free-unspecified"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "0", "CAD"], - ["radroots:price_unit", "g"], - ["status", "active"] + [ + "d", + "writer-free-unspecified" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "0", + "CAD" + ], + [ + "radroots:price_unit", + "g" + ], + [ + "status", + "active" + ] ] } }, @@ -230,15 +545,44 @@ "content": "Fresh food available locally.", "kind": 30402, "tags": [ - ["d", "writer-sold"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "g"], - ["radroots:quantity", "10", "g"], - ["status", "sold"] + [ + "d", + "writer-sold" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "g" + ], + [ + "radroots:quantity", + "10", + "g" + ], + [ + "status", + "sold" + ] ] } }, @@ -249,18 +593,44 @@ "content": "🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕\n\nPublic contact: https://farm.example/contact", "kind": 30402, "tags": [ - ["d", "writer-unicode"], - ["title", "🥕"], + [ + "d", + "writer-unicode" + ], + [ + "title", + "🥕" + ], [ "summary", "🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕🥕" ], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "g"], - ["radroots:quantity", "10", "g"], - ["status", "active"] + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "g" + ], + [ + "radroots:quantity", + "10", + "g" + ], + [ + "status", + "active" + ] ] } }, @@ -271,15 +641,44 @@ "content": "Fresh food available locally.\n\nPublic contact: mailto:seller@example.com", "kind": 30402, "tags": [ - ["d", "writer-email"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "g"], - ["radroots:quantity", "10", "g"], - ["status", "active"] + [ + "d", + "writer-email" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "g" + ], + [ + "radroots:quantity", + "10", + "g" + ], + [ + "status", + "active" + ] ] } }, @@ -290,15 +689,44 @@ "content": "Fresh food available locally.\n\nPublic contact: tel:+12505550123", "kind": 30402, "tags": [ - ["d", "writer-phone"], - ["title", "Fresh food"], - ["summary", "Fresh food available locally."], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "g"], - ["radroots:quantity", "10", "g"], - ["status", "active"] + [ + "d", + "writer-phone" + ], + [ + "title", + "Fresh food" + ], + [ + "summary", + "Fresh food available locally." + ], + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "g" + ], + [ + "radroots:quantity", + "10", + "g" + ], + [ + "status", + "active" + ] ] } }, @@ -309,18 +737,44 @@ "content": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", "kind": 30402, "tags": [ - ["d", "writer-max-content"], - ["title", "Fresh food"], + [ + "d", + "writer-max-content" + ], + [ + "title", + "Fresh food" + ], [ "summary", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" ], - ["published_at", "1700000000"], - ["location", "Victoria"], - ["price", "9999999999999999999999999999", "CAD"], - ["radroots:price_unit", "g"], - ["radroots:quantity", "10", "g"], - ["status", "active"] + [ + "published_at", + "1700000000" + ], + [ + "location", + "Victoria" + ], + [ + "price", + "9999999999999999999999999999", + "CAD" + ], + [ + "radroots:price_unit", + "g" + ], + [ + "radroots:quantity", + "10", + "g" + ], + [ + "status", + "active" + ] ] } } diff --git a/web/tools/check-food-interop.mjs b/web/tools/check-food-interop.mjs @@ -1,4 +1,5 @@ import assert from 'node:assert/strict'; +import { createHash } from 'node:crypto'; import { lstat, mkdtemp, @@ -27,10 +28,10 @@ assert.ok( ); assert.equal(process.versions.node, '24.21.0'); const run = (command, argv, cwd = root) => { + // Compiler and cache waits on a busy host have no outer elapsed cutoff. const result = spawnSync(command, argv, { cwd, encoding: 'utf8', - timeout: 1800000, maxBuffer: 1024 * 1024 }); assert.ifError(result.error); @@ -43,7 +44,7 @@ const success = (command, argv, cwd = root) => { return result.stdout; }; const cargo = [ - '+1.97.1', + '+1.99.0', 'run', '--manifest-path', 'contracts/interop/food_availability/oracle/Cargo.toml', @@ -58,24 +59,25 @@ const names = [ 'provenance.v1.json', 'oracle/src/main.rs' ]; -const inputs = await Promise.all( - names.map(async (name) => { - const path = new URL( - `../../contracts/interop/food_availability/${name}`, - import.meta.url - ); - const info = await lstat(path); - assert.ok( - info.isFile() && - !info.isSymbolicLink() && - info.size > 0 && - info.size <= 1024 * 1024 - ); - const bytes = await readFile(path); - assert.equal(bytes.length, info.size); - return [name, bytes]; - }) -); +async function ownedInput(name) { + const path = new URL( + `../../contracts/interop/food_availability/${name}`, + import.meta.url + ); + const info = await lstat(path); + assert.ok( + info.isFile() && + !info.isSymbolicLink() && + info.size > 0 && + info.size <= 1024 * 1024 + ); + const bytes = await readFile(path); + assert.equal(bytes.length, info.size); + return bytes; +} +const readInputs = () => + Promise.all(names.map(async (name) => [name, await ownedInput(name)])); +const inputs = await readInputs(); const corpus = inputs[0][1]; success(process.execPath, ['tools/check-source.mjs'], web); success('cargo', [...cargo, '--check']); @@ -91,7 +93,6 @@ try { const actual = JSON.parse( success('cargo', [...cargo, '--consume-web', candidate]) ); - const receipt = createFoodReplay(actual, webTemplates, inputs); for (const mutation of ['tag', 'amount']) { const altered = webTemplates.map((row) => ({ ...row, @@ -116,6 +117,50 @@ try { rejected.stderr ); } + if (args[0] === '--write') { + // Refresh producer provenance only after actual Rust corpus equality, + // website consumption and hostile-template rejection have succeeded. + const digest = (bytes) => createHash('sha256').update(bytes).digest('hex'); + const provenance = JSON.parse(inputs[2][1].toString()); + assert.equal(provenance.public_source.revision, actual.revision); + assert.equal(provenance.source_copy.sha256, digest(inputs[1][1])); + assert.equal(provenance.corpus.sha256, digest(corpus)); + const producerNames = [ + 'oracle/Cargo.toml', + 'oracle/Cargo.lock', + 'oracle/rust-toolchain.toml', + 'oracle/src/main.rs' + ]; + assert.deepEqual( + provenance.producer.files.map((row) => row.path).sort(), + producerNames.toSorted() + ); + assert.match( + success('rustup', ['run', '1.99.0', 'rustc', '--version']), + /^rustc 1\.99\.0 / + ); + assert.match( + (await ownedInput('oracle/rust-toolchain.toml')).toString(), + /^channel = "1\.99\.0"$/m + ); + provenance.producer.rust_toolchain = '1.99.0'; + provenance.producer.files = await Promise.all( + producerNames.map(async (path) => { + const bytes = await ownedInput(path); + return { path, sha256: digest(bytes), bytes: bytes.length }; + }) + ); + await writeFile( + new URL( + '../../contracts/interop/food_availability/provenance.v1.json', + import.meta.url + ), + JSON.stringify(provenance, null, 2) + '\n' + ); + } + // The replay must bind the refreshed producer provenance, never stale bytes + // read before an explicitly requested regeneration. + const receipt = createFoodReplay(actual, webTemplates, await readInputs()); if (args[0] === '--write') await writeFile(fixture, JSON.stringify(receipt, null, 2) + '\n'); else @@ -124,6 +169,15 @@ try { receipt, 'checked website/Rust replay is stale; regenerate explicitly with --write' ); + // The shared consumer manifest binds these exact provenance/replay bytes. + success( + process.execPath, + [ + 'tools/generate-interop-manifest.mjs', + ...(args[0] === '--write' ? ['--write'] : []) + ], + web + ); const tests = ( await readdir(new URL('../tests/conformance/', import.meta.url)) ) diff --git a/web/tools/check-message-interop.mjs b/web/tools/check-message-interop.mjs @@ -27,7 +27,7 @@ const folder = new URL('../../contracts/interop/message/', import.meta.url); const revision = '189c49b74b4bafc142b00b76b296477931139e72'; const digest = (bytes) => createHash('sha256').update(bytes).digest('hex'); const cargo = [ - '+1.97.1', + '+1.99.0', 'run', '--manifest-path', 'contracts/interop/message/oracle/Cargo.toml', @@ -37,10 +37,10 @@ const cargo = [ '--' ]; function success(command, argv, cwd = root) { + // Compiler and cache waits on a busy host have no outer elapsed cutoff. const r = spawnSync(command, argv, { cwd, encoding: 'utf8', - timeout: 1800000, maxBuffer: 1024 * 1024 }); assert.ifError(r.error); @@ -69,7 +69,7 @@ await owned('oracle/src/main.rs'); // Offline actual Cargo/cache identity and exact immutable source, never sibling Lib. const metadata = JSON.parse( success('cargo', [ - '+1.97.1', + '+1.99.0', 'metadata', '--manifest-path', 'contracts/interop/message/oracle/Cargo.toml',