Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/replay-format.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ first byte.

```jsonc
{
"decoder": { "name": "icarus_replay", "version": "0.3.5+vrfkit.0.4.0", "vrfkit": "0.4.0" },
"decoder": { "name": "icarus_replay", "version": "0.3.6+vrfkit.0.5.0-6194bde", "vrfkit": "0.5.0-6194bde" },
"match": {
"id": "dc078274-2d68-495b-8321-5e58b2a3eeba",
"mapPath": "/Game/Maps/Juliett/Juliett",
Expand Down Expand Up @@ -316,7 +316,7 @@ the first). A clean replay has none.
"durationMs": 321499,
"recordedAt?": "2026-07-08T00:35:45Z",
"supported": true, // a payload transform is registered for the build
"decoderVersion": "0.3.5+vrfkit.0.4.0", // same as the document's decoder.version
"decoderVersion": "0.3.6+vrfkit.0.5.0-6194bde", // same as the document's decoder.version
"players": [{ "subject": "…", "agentId": "…" }]
}
```
Expand Down
40 changes: 20 additions & 20 deletions native/replay/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 13 additions & 12 deletions native/replay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "icarus_replay"
# Bump whenever the decoded output could change: Icarus keys its cache of
# decoded replays by it (header::DECODER_VERSION), so an unchanged version
# serves the old output.
version = "0.3.5"
version = "0.3.6"
edition = "2024"
rust-version = "1.86"
license = "Apache-2.0"
Expand All @@ -23,26 +23,27 @@ dev-vectors = ["dep:sha2"]
name = "icarus-replay-dump"
path = "src/bin/icarus-replay-dump.rs"

# vrfkit v0.4.0 (b9ba3f7). `vrf-container` keeps its `oodle` feature off so the
# vrfkit 6194bde: v0.5.0 plus vrfkit PR #45 (VALORANT 13.10), not yet tagged.
# Move to the release tag once one carries 13.10. `vrf-container` keeps its `oodle` feature off so the
# GPL-derived oozextract never enters the build; decompression is ours (src/oodle.rs).
[dependencies]
vrf-bitio = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0" }
vrf-container = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0", default-features = false, features = ["event"] }
vrf-schema = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0", default-features = false }
vrf-net = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0" }
vrf-frame = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0" }
vrf-movement = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0" }
vrf-decode = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0" }
vrf-transform = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0" }
vrf-export = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0", default-features = false }
vrf-bitio = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34" }
vrf-container = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34", default-features = false, features = ["event"] }
vrf-schema = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34", default-features = false }
vrf-net = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34" }
vrf-frame = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34" }
vrf-movement = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34" }
vrf-decode = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34" }
vrf-transform = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34" }
vrf-export = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34", default-features = false }
smallvec = { version = "1", features = ["union"] }
thiserror = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = { version = "0.10", optional = true }

[dev-dependencies]
vrf-testkit = { git = "https://github.com/yakisoba0728/vrfkit", tag = "v0.4.0" }
vrf-testkit = { git = "https://github.com/yakisoba0728/vrfkit", rev = "6194bdeece2e64eac1c2c10beb6aab6dc53e8d34" }

[profile.release]
opt-level = 3
Expand Down
3 changes: 2 additions & 1 deletion native/replay/NOTICE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Notices

`native/replay` depends on the vrfkit library crates
(<https://github.com/yakisoba0728/vrfkit>, tag v0.4.0, commit b9ba3f7) and
(<https://github.com/yakisoba0728/vrfkit>, commit 6194bde: tag v0.5.0 plus
the VALORANT 13.10 support in vrfkit pull request #45) and
vendors code from its CLI crate into `src/vendor/` (each file names its
source). vrfkit's NOTICE.md follows verbatim; the full Apache License 2.0 text
is the repository's `LICENSE`, the same as vrfkit's.
Expand Down
6 changes: 3 additions & 3 deletions native/replay/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use crate::error::{ErrorCode, ReplayError};

/// Changes whenever the decoded output could: our version plus vrfkit's tag.
/// The Dart cache keys decoded replays by it.
pub const DECODER_VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "+vrfkit.0.4.0");
pub const VRFKIT_VERSION: &str = "0.4.0";
pub const DECODER_VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "+vrfkit.0.5.0-6194bde");
pub const VRFKIT_VERSION: &str = "0.5.0-6194bde";

/// The facts the probe returns (docs/replay-format.md, "Probe").
#[derive(Debug, Clone, Serialize)]
Expand Down Expand Up @@ -188,7 +188,7 @@ mod tests {

#[test]
fn decoder_version_names_both_versions() {
assert_eq!(DECODER_VERSION, "0.3.5+vrfkit.0.4.0");
assert_eq!(DECODER_VERSION, "0.3.6+vrfkit.0.5.0-6194bde");
assert!(DECODER_VERSION.ends_with(VRFKIT_VERSION));
}

Expand Down
2 changes: 1 addition & 1 deletion native/replay/src/vendor/frame.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrf-frame/src/lib.rs and
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrf-frame/src/lib.rs and
// sections.rs. Apache-2.0; see native/replay/NOTICE.md. Local edits:
// `walk_demo_frames` takes a `before_exports` hook that sees each frame's
// ExportData before the cache applies it, both callbacks return `false` to
Expand Down
2 changes: 1 addition & 1 deletion native/replay/src/vendor/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Code vendored from vrfkit v0.4.0 (b9ba3f7, Apache-2.0; NOTICE.md), kept
//! Code vendored from vrfkit 6194bde (v0.5.0 + PR #45, Apache-2.0; NOTICE.md), kept
//! apart from ours so a vrfkit bump is a readable diff: re-copy the source
//! files over these and re-apply the edits listed here.
//!
Expand Down
2 changes: 1 addition & 1 deletion native/replay/src/vendor/pass.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrfkit/src/pass.rs. Apache-2.0;
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrfkit/src/pass.rs. Apache-2.0;
// see native/replay/NOTICE.md. Local edits: `Replay`, `for_each_chunk` and the
// checkpoint block scope are dropped (crate::decode walks the chunks), the
// CLI error type is replaced by `vrf_frame::FrameError`, and `walk` runs our
Expand Down
15 changes: 8 additions & 7 deletions native/replay/src/vendor/sink/blobs.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrfkit/src/sink/blobs.rs. Apache-2.0;
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrfkit/src/sink/blobs.rs. Apache-2.0;
// see native/replay/NOTICE.md. Local edits: listed in src/vendor/mod.rs.

//! Additive decoders for two payload shapes the field stream hands over whole:
Expand All @@ -14,8 +14,8 @@
use smallvec::SmallVec;
use vrf_bitio::BitReader;
use vrf_decode::{
ABILITY_CASTS_SCHEMA, ArrayDecodeStats, COMBAT_ROUNDS_SCHEMA, EffectArrayKind, FieldType,
FlattenedField, structs,
ABILITY_CASTS_SCHEMA, ArrayDecodeStats, COMBAT_ROUNDS_SCHEMA, COMBAT_ROUNDS_SCHEMA_1310,
EffectArrayKind, FieldType, FlattenedField, structs,
};
use vrf_schema::NetGuidCache;

Expand Down Expand Up @@ -484,10 +484,11 @@ impl ExportSink<'_> {
};
let flattened = match route {
None => {
let schema = if kind == ArrayKind::Rounds {
&COMBAT_ROUNDS_SCHEMA
} else {
&ABILITY_CASTS_SCHEMA
let schema = match kind {
ArrayKind::Rounds if self.release_1310_layouts => &COMBAT_ROUNDS_SCHEMA_1310,
ArrayKind::Rounds => &COMBAT_ROUNDS_SCHEMA,
ArrayKind::AbilityCasts => &ABILITY_CASTS_SCHEMA,
ArrayKind::Measured(_) => unreachable!("measured route handled separately"),
};
vrf_decode::decode_struct_array(
raw,
Expand Down
2 changes: 1 addition & 1 deletion native/replay/src/vendor/sink/failure_stats.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrfkit/src/sink/failure_stats.rs. Apache-2.0;
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrfkit/src/sink/failure_stats.rs. Apache-2.0;
// see native/replay/NOTICE.md. Local edits: listed in src/vendor/mod.rs.

//! The opt-in, bounded aggregate of stream failures. Only `diag` enables and
Expand Down
2 changes: 1 addition & 1 deletion native/replay/src/vendor/sink/intern.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrfkit/src/sink/intern.rs. Apache-2.0;
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrfkit/src/sink/intern.rs. Apache-2.0;
// see native/replay/NOTICE.md. Local edits: listed in src/vendor/mod.rs.

//! A string pool for the two name columns of `fields.parquet`: a row's name
Expand Down
37 changes: 31 additions & 6 deletions native/replay/src/vendor/sink/measured_routes.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrfkit/src/sink/measured_routes.rs. Apache-2.0;
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrfkit/src/sink/measured_routes.rs. Apache-2.0;
// see native/replay/NOTICE.md. Local edits: listed in src/vendor/mod.rs.

//! Which checksum-gated structured-array routes a replay branch admits.
Expand Down Expand Up @@ -81,10 +81,12 @@ impl MeasuredArrayRoutes {
/// - `SelectedV2` 11.06-11.08: a zero-width `DynamicMappings` at 13 moves the nested array.
/// - `ActiveBlinds`, every legacy build: `SourceID`/`EffectID` swapped through 12.04,
/// 9-bit hardcoded-name `SourceID`s from 12.05; refusals move `array_leaf_decode_errors`.
/// - Any route with no child observed on a build (the path on 11.06, 12.06, 12.07).
/// - Any route with no child observed on a build (the path on 11.06, 12.06, 12.07, 13.08).
///
/// 13.08 rests on one replay and 13.09 on two, main stream and checkpoints.
pub(super) fn for_branch(branch: &str) -> Self {
use MeasuredArrayRoute::{
AllPlayersObfuscatedPlayerInformation as PlayerInfo, KillData,
ActiveBlinds, AllPlayersObfuscatedPlayerInformation as PlayerInfo, KillData,
NetworkedProjectilePath as ProjectilePath, RequestedIgnoreActors, SelectedV2,
ServerActiveEffects, TrackedRewards,
};
Expand Down Expand Up @@ -141,7 +143,18 @@ impl MeasuredArrayRoutes {
| "++Ares-Core+release-13.02"
| "++Ares-Core+release-13.04"
| "++Ares-Core+release-13.05"
| "++Ares-Core+release-13.06" => Self::ALL,
| "++Ares-Core+release-13.06"
| "++Ares-Core+release-13.09" => Self::ALL,
// The one sample declares no MulticastSetPath group: the path is unobserved.
"++Ares-Core+release-13.08" => Self::of(&[
PlayerInfo,
TrackedRewards,
SelectedV2,
KillData,
ServerActiveEffects,
RequestedIgnoreActors,
ActiveBlinds,
]),
_ => Self::NONE,
}
}
Expand Down Expand Up @@ -210,6 +223,16 @@ mod tests {
];
/// 12.10, 12.11 and 13.00: the only four routes their one fixture holds.
const FIXTURE: &[Route] = &[PlayerInfo, TrackedRewards, SelectedV2, ServerActiveEffects];
/// 13.08: every route but the path, which its one sample never declares.
const B1308: &[Route] = &[
PlayerInfo,
TrackedRewards,
SelectedV2,
KillData,
ServerActiveEffects,
RequestedIgnoreActors,
ActiveBlinds,
];

/// Every supported branch and the routes it admits, in the order of
/// `vrf_transform::ALL_VERSIONS`. A change to the gate is a change to this
Expand Down Expand Up @@ -239,8 +262,10 @@ mod tests {
("++Ares-Core+release-13.04", ALL),
("++Ares-Core+release-13.05", ALL),
("++Ares-Core+release-13.06", ALL),
("++Ares-Core+release-13.08", &[]),
("++Ares-Core+release-13.09", &[]),
("++Ares-Core+release-13.08", B1308),
("++Ares-Core+release-13.09", ALL),
// No array route has been independently measured on 13.10 yet.
("++Ares-Core+release-13.10", &[]),
];

#[test]
Expand Down
6 changes: 5 additions & 1 deletion native/replay/src/vendor/sink/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrfkit/src/sink/mod.rs. Apache-2.0;
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrfkit/src/sink/mod.rs. Apache-2.0;
// see native/replay/NOTICE.md. Local edits: listed in src/vendor/mod.rs.

//! Sink implementation connecting `vrf-net` events to `vrf-export` records.
Expand Down Expand Up @@ -563,6 +563,8 @@ pub struct ExportSink<'a> {
/// The checksum-gated structured-array routes this replay's branch admits.
/// See [`measured_routes`]; empty until `enable_measured_array_routes`.
measured_array_routes: MeasuredArrayRoutes,
/// Exact release gate for the changed nested-array layouts measured on 13.10.
release_1310_layouts: bool,
checkpoint_block_scope: Option<(CheckpointIdentity, u64, u32)>,

// -- per-content-block context (set by on_content_block) ----------------
Expand Down Expand Up @@ -606,6 +608,7 @@ impl<'a> ExportSink<'a> {
records,
stats: ExportStats::default(),
measured_array_routes: MeasuredArrayRoutes::NONE,
release_1310_layouts: false,
checkpoint_block_scope: None,
current_channel: 0,
current_actor_guid: 0,
Expand All @@ -622,6 +625,7 @@ impl<'a> ExportSink<'a> {
/// Admit the structured-array routes measured for `branch` ([`measured_routes`]).
pub(super) fn enable_measured_array_routes(&mut self, branch: &str) {
self.measured_array_routes = MeasuredArrayRoutes::for_branch(branch);
self.release_1310_layouts = branch == "++Ares-Core+release-13.10";
}

/// Whether `route` may expand its parent in this replay.
Expand Down
2 changes: 1 addition & 1 deletion native/replay/src/vendor/sink/paths.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vendored from vrfkit v0.4.0 (b9ba3f7), crates/vrfkit/src/sink/paths.rs. Apache-2.0;
// Vendored from vrfkit 6194bde (v0.5.0 + PR #45), crates/vrfkit/src/sink/paths.rs. Apache-2.0;
// see native/replay/NOTICE.md. Local edits: listed in src/vendor/mod.rs.

//! Content-block group-path resolution.
Expand Down
Loading
Loading