@@ -4,9 +4,9 @@ Read and follow @AGENTS.md.
 
 Deploy repo: a source change regenerates `src/generated/candidate/` and merges
 without deploying. Deploying and publishing happen together at a release
-(below). `LibRaindexDeploy` is the candidate; `LibRaindexProdDeploy` pins the
-release `[external.package].version` names, and every on-chain, start-block,
-`networks.json` and `subgraph.yaml` test reads it. Address/codehash churn is
+(below). `LibRaindexDeploy` is the candidate. The start-block, `networks.json`
+and `subgraph.yaml` tests read the released RaindexV6 from the newest entry of
+the generated `LibRaindexV6Released`. Address/codehash churn is
 routine; don't stop to ask about it.
 
 ## Merging a PR
@@ -46,9 +46,8 @@ changed artifacts or `git-clean` drifts red. Nothing is deployed.
    `ONCHAIN EXECUTION COMPLETE & SUCCESSFUL` (only `--verify` failed).
 2. One PR: bump `foundry.toml [external.package].version`, run
    `forge script ./script/Build.sol --sig 'cutRelease()'` (freezes `candidate/`
-   as `src/generated/<tag>/`), repoint `LibRaindexProdDeploy`'s imports at
-   `<tag>` (`LibRaindexProdDeployTest` reds until it agrees with the version),
-   and if RaindexV6 moved run `script/build-start-blocks.sh` (start blocks,
+   as `src/generated/<tag>/`), and if RaindexV6 moved run
+   `script/build-start-blocks.sh` (`LibRaindexV6StartBlock`,
    `networks.json`, `subgraph.yaml`).
 3. Merge, then push tag `sol-v<version>`. Via rainix `rainix-tag-release.yaml`
    (`package-release.yaml`) it re-runs the fork suite and `release-guard`
 
@@ -4,10 +4,11 @@
 
 # Refresh the RaindexV6 deploy-block bookkeeping after a release.
 #
-# Finds the exact block at which the released RaindexV6 that LibRaindexProdDeploy
-# pins was deployed on each mainnet by binary-searching `eth_getCode` over an
-# archive RPC, then rewrites the new per-chain blocks + that address into:
-#   - the RAINDEX_START_BLOCK_* constants in src/lib/deploy/LibRaindexProdDeploy.sol
+# Finds the exact block at which the newest released RaindexV6 (the last entry
+# of LibRaindexV6Released) was deployed on each mainnet by binary-searching
+# `eth_getCode` over an archive RPC, then rewrites the new per-chain blocks +
+# that address into:
+#   - the RAINDEX_START_BLOCK_* constants in src/lib/deploy/LibRaindexV6StartBlock.sol
 #   - subgraph/networks.json (address + startBlock per network)
 #   - subgraph/subgraph.yaml (data source address)
 #
@@ -19,11 +20,14 @@
 # tests.
 set -euo pipefail
 
-LIB="src/lib/deploy/LibRaindexProdDeploy.sol"
+LIB="src/lib/deploy/LibRaindexV6StartBlock.sol"
+RELEASED="src/lib/LibRaindexV6Released.sol"
 NET="subgraph/networks.json"
 YAML="subgraph/subgraph.yaml"
-PTR=src/$(grep -aoE "generated/[0-9]+_[0-9]+_[0-9]+/RaindexV6.sol" "$LIB" | head -1)
-[ -f "$PTR" ] || { echo "could not read the released RaindexV6 snapshot from $LIB" >&2; exit 1; }
+TAG=$(grep -aoE 'storedDeployedAddress: RaindexV6_[A-Za-z0-9_]+_DEPLOYED_ADDRESS' "$RELEASED" | tail -1 \
+    | sed -E 's/.*RaindexV6_(.+)_DEPLOYED_ADDRESS/\1/' || true)
+PTR="src/generated/${TAG}/RaindexV6.sol"
+[ -n "$TAG" ] && [ -f "$PTR" ] || { echo "could not read the newest released RaindexV6 snapshot from $RELEASED" >&2; exit 1; }
 
 ARB_RPC="${ARBITRUM_RPC_URL:-https://arbitrum.drpc.org}"
 BASE_RPC="${BASE_RPC_URL:-https://mainnet.base.org}"
 
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: LicenseRef-DCL-1.0
+// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
+pragma solidity ^0.8.25;
+
+/// @title LibRaindexV6StartBlock
+/// @notice The block the newest released RaindexV6 was deployed at on each
+/// chain the subgraph indexes.
+library LibRaindexV6StartBlock {
+    uint256 constant RAINDEX_START_BLOCK_ARBITRUM = 473899359;
+    uint256 constant RAINDEX_START_BLOCK_BASE = 47387582;
+    uint256 constant RAINDEX_START_BLOCK_FLARE = 63011168;
+    uint256 constant RAINDEX_START_BLOCK_POLYGON = 88573024;
+}