Merge pull request #2919 from rainlanguage/2026-10-25-deploy-convention

Convert raindex to the .deploy convention: prod/subgraph tests pin the released suite

Author: thedavidmeister

CLAUDE.md

@@ -2,10 +2,12 @@ Read and follow @AGENTS.md.
 
 # Merge / Publish / Deploy runbook
 
-Contract change chain: edit source → **deploy** the new bytecode to its new
-CREATE2 address → **merge**. Publishing to soldeer is a separate manual tag
-release (below), never a side effect of merging. All of it is routine and
-pre-authorized; don't stop to ask about address/codehash churn.
+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. 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
 
@@ -28,41 +30,29 @@ pre-authorized; don't stop to ask about address/codehash churn.
   workflow re-runs and history rewrites are hook-blocked — these are the allowed
   equivalents; don't spell the blocked forms out or you'll trip those hooks.)
 
-## Deploying a contract (the bytecode cascade)
+## Source changes
 
-Any source change to a CREATE2/zoltu-deployed contract moves its on-chain
-address + codehash. Do the whole cascade without asking:
+Regenerate artifacts — run the `rainix-copy-artifacts` step sequence (see that
+workflow) in `nix develop github:rainlanguage/rainix#sol-shell`. Stage ALL
+changed artifacts or `git-clean` drifts red. Nothing is deployed.
 
-1. Regenerate artifacts — run the `rainix-copy-artifacts` step sequence (see
-   that workflow) in `nix develop github:rainlanguage/rainix#sol-shell`. Stage
-   ALL changed artifacts or `git-clean` drifts red.
-2. Deploy each changed suite:
-   `gh workflow run manual-sol-artifacts.yaml --ref <branch> -f suite=<x>`. One
-   dispatch deploys all seven chains. **Never run two deploys concurrently** —
-   they share one deployer EOA and race the nonce, leaving a partial deploy;
-   serialize dispatches. A `completed/failure` run still deployed if the log has
-   `ONCHAIN EXECUTION COMPLETE & SUCCESSFUL` — only etherscan `--verify` failed
-   (cosmetic).
-3. If RaindexV6 moved, run `script/build-start-blocks.sh` — rewrites the
-   `RAINDEX_START_BLOCK_*` constants, `subgraph/networks.json` and
-   `subgraph/subgraph.yaml` (else `testIsStartBlock*` / `testNetworksJson*` /
-   `testSubgraphYamlAddress` red). Uses foundry `rpc_endpoints` env vars,
-   falling back to public archive RPCs.
-4. `testProdDeploy*` fork tests stay red until the new addresses have code
-   on-chain; re-trigger PR CI with an empty commit after deploying.
-
-## Publishing to soldeer (tag release)
+## Releasing (deploy + publish)
 
-- Manual tag release via rainix `rainix-tag-release.yaml@main`
-  (`package-release.yaml`, `sol-v*` tags). Merges to main do NOT publish.
-- To cut a release: deploy changed suites first, then one PR that runs
-  `forge script ./script/Build.sol --sig 'cutRelease()'` — freezing the
-  candidate pins as `src/generated/<tag>/` — and bumps
-  `foundry.toml [external.package].version` to match. Merge, then push tag
-  `sol-v<version>`.
-- The tag re-runs the fork suite and `release-guard` (version == tag, frozen dir
-  present and byte-identical to `candidate/`, clean tree after regeneration, no
-  later tag frozen), then publishes `raindex~<version>` and cuts the GitHub
-  release.
-- `src/generated/<tag>/` snapshots are append-only — the
-  `frozen-snapshots-append-only` gate reds any PR that edits or deletes one.
+1. Deploy each changed suite:
+   `gh workflow run manual-sol-artifacts.yaml --ref main -f suite=<x>`. One
+   dispatch deploys all seven chains. **Never run two deploys concurrently** —
+   they share one deployer EOA and race the nonce; serialize dispatches. A
+   `completed/failure` run still deployed if the log has
+   `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>/`), 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`
+   (version == tag, frozen dir byte-identical to `candidate/`, clean tree, no
+   later tag frozen), then publishes `raindex-deploy~<version>`.
+
+`src/generated/<tag>/` snapshots are append-only — the
+`frozen-snapshots-append-only` gate reds any PR that edits or deletes one.

foundry.toml

@@ -11,7 +11,7 @@
 # `release-guard` checks it against the pushed `sol-v<version>` tag before
 # anything publishes.
 [external.package]
-name = "raindex"
+name = "raindex-deploy"
 version = "0.1.15"
 
 [profile.default]

script/build-start-blocks.sh

@@ -2,12 +2,13 @@
 # SPDX-License-Identifier: LicenseRef-DCL-1.0
 # SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 
-# Refresh the RaindexV6 deploy-block bookkeeping after a redeploy.
+# Refresh the RaindexV6 deploy-block bookkeeping after a release.
 #
-# Finds the exact block at which the currently-pinned RaindexV6 was deployed on
-# each mainnet by binary-searching `eth_getCode` over an archive RPC, then
-# rewrites the new per-chain blocks + the current pinned address into:
-#   - the RAINDEX_START_BLOCK_* constants in src/lib/deploy/LibRaindexDeploy.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,10 +20,14 @@
 # tests.
 set -euo pipefail
 
-LIB="src/lib/deploy/LibRaindexDeploy.sol"
+LIB="src/lib/deploy/LibRaindexV6StartBlock.sol"
+RELEASED="src/lib/LibRaindexV6Released.sol"
 NET="subgraph/networks.json"
 YAML="subgraph/subgraph.yaml"
-PTR="src/generated/candidate/RaindexV6.sol"
+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}"

src/lib/deploy/LibRaindexDeploy.sol

@@ -78,9 +78,4 @@ library LibRaindexDeploy {
     /// The code hash of the `GenericPoolRaindexV6FlashBorrower` contract when
     /// deployed with the rain standard zoltu deployer.
     bytes32 constant GENERIC_POOL_FLASH_BORROWER_DEPLOYED_CODEHASH = GENERIC_POOL_FB_HASH;
-
-    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;
 }

src/lib/deploy/LibRaindexV6StartBlock.sol

@@ -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;
+}