Merge pull request #598 from kleros/chore/remove-unnecesary-duplication

chore: remove unnecessary duplication in claim modal

Author: kemuru

scripts/emit-snapshots.js

@@ -1,26 +1,20 @@
 #!/usr/bin/env node
 /**
- * 1. Verifies src/assets/snapshots.json still matches the `snapshots` arrays in
- *    src/components/claim-modal.js, and fails the build if they have drifted.
- * 2. Copies the manifest to public/snapshots.json so the standalone
- *    staking-rewards.html page can read it same-origin (files under public/ are
- *    copied verbatim by the build and cannot import from src/).
+ * Validates src/assets/snapshots.json — the source of truth for the monthly reward snapshot CIDs —
+ * and copies it to public/snapshots.json, which the build publishes at court.kleros.io/snapshots.json.
  *
- * The arrays in claim-modal.js are duplicated here on purpose, and only
- * temporarily: raw.githubusercontent.com/kleros/court/master/src/components/claim-modal.js
- * is scraped by klerosboard and proof-of-humanity-v2-web to locate the monthly
- * reward snapshots. Once those repos point at snapshots.json instead, delete the
- * arrays from claim-modal.js, have it import this manifest, and drop assertParity().
+ * That published manifest is read same-origin by the standalone staking-rewards.html page and, cross-
+ * origin, by klerosboard and proof-of-humanity-v2-web. src/components/claim-modal.js and
+ * src/helpers/rewards.js import snapshots.json directly.
  *
- * The array index of each snapshot is the on-chain `week` argument to
- * MerkleRedeem.claimWeek, so order and length must never change.
+ * The array index of each snapshot is the on-chain `week` argument to MerkleRedeem.claimWeek,
+ * so order and length must never change.
  */
 const fs = require("fs");
 const path = require("path");
 
 const root = path.join(__dirname, "..");
 const source = path.join(root, "src", "assets", "snapshots.json");
-const claimModal = path.join(root, "src", "components", "claim-modal.js");
 const destination = path.join(root, "public", "snapshots.json");
 
 // Every chain the reward snapshots cover, declared once. To support a new chain, add one entry
@@ -80,29 +74,6 @@ function assertNewestMonthIsOnEveryChain(snapshots) {
   }
 }
 
-// Read the `snapshots: [...]` array literal for a chain out of claim-modal.js. This is coupled to
-// that file's current indentation; reformatting it will throw here rather than pass silently.
-function readClaimModalSnapshots(code, chainId) {
-  const block = code.match(new RegExp(`\\n  ${chainId}: \\{[\\s\\S]*?snapshots: \\[([\\s\\S]*?)\\n    \\]`));
-  if (!block) throw new Error(`claim-modal.js: could not find the snapshots array for chain ${chainId}`);
-  return Array.from(block[1].matchAll(/"([^"]+)"/g), (match) => match[1]);
-}
-
-function assertParity(snapshots) {
-  const code = fs.readFileSync(claimModal, "utf8");
-  for (const chainId of CHAIN_IDS) {
-    const expected = readClaimModalSnapshots(code, chainId);
-    const actual = snapshots[chainId];
-    const drifted = expected.length !== actual.length || expected.some((entry, i) => entry !== actual[i]);
-    if (drifted) {
-      throw new Error(
-        `snapshots.json and claim-modal.js disagree for chain ${chainId} ` +
-          `(${actual.length} vs ${expected.length} entries). Update both, keeping the order identical.`
-      );
-    }
-  }
-}
-
 const snapshots = JSON.parse(fs.readFileSync(source, "utf8"));
 
 // Everything below is verified per chain in CHAIN_IDS, but the whole object is written out. Reject
@@ -111,7 +82,7 @@ const unverifiedChains = Object.keys(snapshots).filter((chainId) => !CHAIN_IDS.i
 if (unverifiedChains.length > 0) {
   throw new Error(
     `snapshots.json: chain(s) ${unverifiedChains.join(", ")} are not verified. Add them to CHAINS ` +
-      `(and claim-modal.js) so they are validated before being published.`
+      `so they are validated before being published.`
   );
 }
 
@@ -122,6 +93,5 @@ for (const chainId of CHAIN_IDS) {
   assertEntriesAreWellFormed(snapshots[chainId], chainId);
 }
 assertNewestMonthIsOnEveryChain(snapshots);
-assertParity(snapshots);
 
 fs.writeFileSync(destination, JSON.stringify(snapshots) + "\n");

src/components/claim-modal.js

@@ -11,6 +11,7 @@ import useChainId from "../hooks/use-chain-id";
 import ETHAmount from "./eth-amount";
 import { klerosboardSubgraph } from "../bootstrap/subgraph";
 import { IPFS_GATEWAY } from "../utils/ipfs";
+import snapshotsByChainId from "../assets/snapshots.json";
 
 const StyledModal = styled(Modal)`
   max-width: calc(100vw - 32px);
@@ -84,143 +85,19 @@ const StyledHr = styled.hr`
   margin-bottom: 32px;
 `;
 
+// Snapshot CIDs live in src/assets/snapshots.json (also published at court.kleros.io/snapshots.json,
+// consumed by klerosboard and proof-of-humanity-v2-web). The array index of each snapshot is the
+// on-chain `week` argument to MerkleRedeem.claimWeek, so the order in snapshots.json must never change.
 const chainIdToParams = {
   1: {
     contractAddress: "0xdbc3088Dfebc3cc6A84B0271DaDe2696DB00Af38",
-    snapshots: [
-      "QmYJGrQBh68kAvqk57FdynEixdu4VY87mHme821rtPS92u/snapshot-1.json",
-      "QmUCTdvyAWU8eEV1nwgiF7CwKpL5FnXiDxGD9FedFdrHYU/snapshot-2021-03.json",
-      "QmXG2EKcd3tyMwoxhrqmBAu7gsrzgF3jCde75CjQzmg1Am/snapshot-2021-04.json",
-      "QmYEpiCACmZttwxFqsG4sSYsCpUeGchEgJGSRQFPuB6Txe/snapshot-2021-05.json",
-      "QmQ6Bdih6SR4KjoMeAPwvkfp33pYTQXEAAkSeZxGeHXCpo/snapshot-2021-06.json",
-      "QmUvo4mMGCz4dK8dMY1D68RBqEmyg1qpjxauo99FGDkMos/snapshot-2021-07.json",
-      "Qmdv94xuQoe5yy88NyBC8sRFLXwx7sqpWJKbGX5xx1cKjM/snapshot-2021-08.json",
-      "QmTJNeQ9mSyrKiPDaRxX9ektijkZXofra3wYwzbiej1ppB/snapshot-2021-09.json",
-      "QmRPFBHemHrmGFQCvxtwA13VQs2dR9KujZCBYMXrpw6pHd/snapshot-2021-10.json",
-      "QmRKxvfmskMboUcGb2jK6HMVDAPC7RtchxMbhaKH7aQFTm/snapshot-2021-11.json",
-      "QmVoSJv7TP3KZp71vbbm1ocHrt1RfYarZW8zEn7vR67Bj2/snapshot-2021-12.json",
-      "QmRARe8tM5wZwUmViqJFmMTMfm5XNUroLW4w8TPYfkDAR9/snapshot-2022-01.json",
-      "QmWY3uExz6kWtAkKq7hZuoZAPa4NYvUyk2FD7u4Xkp22da/snapshot-2022-02.json",
-      "Qmaz1f7ets65kCCYi5z2Feot3NLCKqQ8vn7zaLdm4Rbmqy/snapshot-2022-03.json",
-      "Qmdcxpb4TDCPPEcgF3eVw7Nz2Ch2LzRNigPPLy9S4W6h2M/snapshot-2022-04.json",
-      "Qmc2S1mcMjjHCX5TSrt1xioA9z7hB6seh9BKEfVjD1kwGG/snapshot-2022-05.json",
-      "QmenR1R6NMfCPcwN1gyJAj9RbpqUQMAnDHCybpB6s4Tsff/snapshot-2022-06.json",
-      "QmUWkVsXgGHsJ26VgphjZwDPzEtdkcPNAo1xogcPHfMCLt/snapshot-2022-07.json",
-      "QmUaJ5vxD9zVRqNiU2t7GgUL1vLmWKFHanaCEik9Mkzm3v/snapshot-2022-08.json",
-      "QmTDo9Mv2W6mQLqpxwRVpNTHEJzzNProiHQLppu95VVnXa/snapshot-2022-09.json",
-      "QmdK6dgxuBCRJ7wTvQBnHrZWJuWGiiFpEDLM6nr38FgYGF/snapshot-2022-10.json",
-      "QmbKotXSryjrRMEeeM51ChgBxpq8DFhwViG6rKLsJfu5wq/snapshot-2022-11.json",
-      "QmU2XtH8sSC4rGgfpchqnFXKGaXzzj1PTpnUXdfR4NfUYL/snapshot-2022-12.json",
-      "QmUrG7TNEjeYcCrvJ1WsCT7SVbBC81R2bJxRUmUVXBK3rx/snapshot-2023-01.json",
-      "QmW1BkMv4pRDTjrNkrcp6njLc61HBmD2yD8Jk5nnPn7gmR/snapshot-2023-02.json",
-      "QmUfaq5LctG4dZmSEBGnNoDgKqEdyooibYhnivKcp7Xvf2/snapshot-2023-03.json",
-      "QmRSkssLsS4A4KMpdKRVW8vS72kXcRbC4aG5i5rGcoi2Gi/snapshot-2023-04.json",
-      "QmbBQoSXrmQFj9cUNWbPcoE7B6MKs4sZ5mtt8Vnu3ZMWdE/snapshot-2023-05.json",
-      "QmV3gpEkEv4btxAxnPjionT9QxbVo2fKj9fTFnuLjDTQ6N/snapshot-2023-06.json",
-      "QmTqXB4i1wd3vvBNknFvixRD7dA36EWxQoBxsEvR3L3bWw/snapshot-2023-07.json",
-      "QmfEb61fZ8QV9LX8Y7VU5AcnzCtjxDTFejzMAgAmUajrRH/snapshot-2023-08.json",
-      "QmUaApTCER7A3cfJUMvakoP4BWGMHsSjqhChcr1pn5rJKL/snapshot-2023-09.json",
-      "QmXSrwywMP5vipMbryJAezUP3zFAPTKAaCRkRLc4NZcRR7/snapshot-2023-10.json",
-      "QmbZ9ZVxJhNDRGokQ1PSqaLLprhgtAAm4m7kB2CY9GiaGD/snapshot-2023-11.json",
-      "QmZ1G5hK72tXynU8bj63QATopRgvV55h7Y5rgz3fofkCtw/snapshot-2023-12.json",
-      "Qme5CAtUNaNF3D5QEV3K4Je2uCkaH1kUWM6zNb3W8xr3dk/snapshot-2024-01.json",
-      "QmPmrHWcGrXD9F2YDDS4BiZxZbv5qDxakhDw1MRH58tUjP/snapshot-2024-02.json",
-      "QmWDAc4nE2P6XuPXjj5FMs68oUg2Bdz2GHsUJXpywqbjz8/snapshot-2024-03.json",
-      "QmbJ3tiiH7pRB6iLfSoJVtEG2dx7pY7YHCqc13y3FeekZQ/snapshot-2024-04.json",
-      "QmSCLnDTGSonAzmLrpHdQMumRe3V35pGbnXHPGm71pAdXj/snapshot-2024-05.json",
-      "QmUnVTiaqSTMyjQ31GWanKzN2ZVZoUiYQcPwgptxxfMptX/snapshot-2024-06.json",
-      "QmTJ6dcTrdqW4SJZzcm14h7cavHepN9HF2qAHsRZVCpzby/snapshot-2024-07.json",
-      "Qme4JAKA84Kvb7C6aNCQ3fcoTfrrMukdkNwUfqjJLhhHQz/snapshot-2024-08.json",
-      "QmSNu2C8nSRLzF1E7UNyV8HDSrcVfSy8JWq86hcPRCJKWo/snapshot-2024-09.json",
-      "QmcwjSjgtTD5JC52DNbXVv8tNxL1ou3Ap98k8ViwQxw6HJ/snapshot-2024-10.json",
-      "QmT76RCkaMqPPHM5kyy9FKdjNATdYVEeZpWkNeTVKEMQRC/snapshot-2024-11.json",
-      "QmRHKSvdm8MPnQy1GKwRtikDNAsbLoPS679vBR2Ype8mut/snapshot-2024-12.json",
-      "QmfSrb13pZvvgSQ4oGtocshzsRDNMatBUxADdwG2uda5qR/snapshot-2025-01.json",
-      "QmUfBdXtNwozCjBPmqjmFwpEDkopZ6Xua9zL9VVpc6ZSnw/snapshot-2025-02.json",
-      "QmbXChWWrjS5LsmkRWVfxe3eYZrMs1PZ8w3sxQgKbShLop/snapshot-2025-03.json",
-      "QmaLsXtgbAqVurvu2rsZScm1NkHVc4JX9G8xyAnh5NzDaC/snapshot-2025-04.json",
-      "QmQi5hsCEwdSyeoqMqZcdPJ9avCp3oUFcetQQtUKBzZE5m/snapshot-2025-05.json",
-      "QmXS6E2guk1S1joqacmVJ57rkk9SHfepU94jZbMubfciGm/snapshot-2025-06.json",
-      "QmTL3stctAApqXScehRVRJsV48QyAVTPUPLw9JLTTQTxLK/snapshot-2025-07.json",
-      "QmS9y2nF7pzsjH7UbN7fmfxxzmJ5KGjfq4Xi6wBLDxhsp4/snapshot-2025-08.json",
-      "Qme31g7UyrGVarRa6LLoaLSuxNGS8tWBfs7CHD5cgNmcXM/snapshot-2025-09.json",
-      "QmV6ELz1HGkZ2X9XEsgatcAbjvayzK5haXNBTPWtVM95TR/snapshot-2025-10.json",
-      "QmbCX7i5jiXzRUtuz2SnHkEX1UeFH4sfPhA6qEJRaWWDy1/snapshot-2025-11.json",
-      "QmUUnd3wykSXqT6vadg1vaXms4F7vDtpZLUggB43XwJtfi/snapshot-2025-12.json",
-      "QmZMFHPvXunVJstEn4R3Y4DanPyBNH5Dgy115y7dgQicqu/snapshot-2026-01.json",
-      "Qmazo37dq9vMBbFq8HgCjtA8Fw2umhy9opJfUwFmcaYhqH/snapshot-2026-02.json",
-      "QmYFqvcPB2UUr3KZ8WoTk7fDpm8VSc29fgQ48PwTNN1pFo/snapshot-2026-03.json",
-      "QmPpPgexYV32ug1h83kgfR6BrMPvwQYHjf62Fve6VMS8vN/snapshot-2026-04.json",
-      "QmcjUmXzPS1X1pFFTxA7JZBzKt7LAup7zR8FNUgs6LCNtb/snapshot-2026-05.json",
-      "QmPSTV5nFHuoc5nBcp41Ddv2gumVRuxJXLGaEBPJNeFXwJ/snapshot-2026-06.json",
-    ],
+    snapshots: snapshotsByChainId["1"],
     blockExplorerBaseUrl: "https://etherscan.io",
     klerosboard: klerosboardSubgraph[1],
   },
   100: {
     contractAddress: "0xf1A9589880DbF393F32A5b2d5a0054Fa10385074",
-    snapshots: [
-      "QmRJQn5K3zaKH5TaSb3xEq8WBpJZhEaEKURj2kFssqEkeb/xdai-snapshot-2021-07.json",
-      "QmUWvWmW53xZYqQEx1i1w4eCGg7nowpHZ6WY5caJdPDDZK/xdai-snapshot-2021-08.json",
-      "QmeqtF2wFoUd5uNDuXwPTwCyaF5ZjgKFLuqSQQQ2uM5qEP/xdai-snapshot-2021-09.json",
-      "QmUtVwhcqhX3vm6rtzEKD9K5eCMFR6b7VjotTGKts2Njmm/xdai-snapshot-2021-10.json",
-      "QmcotSzkVhxK4AAaEyv4n7hks9oX6z8AjEfCL1QcGH9mB5/xdai-snapshot-2021-11.json",
-      "QmSGLSzRNtDJ2Lt59muizuKrcpWs9KS9RdsEiBuDRsx7nR/xdai-snapshot-2021-12.json",
-      "QmQ4yZgoUopYbudnz88i7MSXcTY4NDB1P9KuAMUejtawup/xdai-snapshot-2022-01.json",
-      "Qmd7EAFoEBDuJkALRsE6pPtqaYjPt543omZQGipupntGWy/xdai-snapshot-2022-02.json",
-      "QmUaWM1yjB9CdHohvTdTqaR8wDggLy4q3tDThS7kZV1p1M/xdai-snapshot-2022-03.json",
-      "QmThLvjyhgWnK5a26i5ibajGBgnwZwN651TmWLvb9T4uZU/xdai-snapshot-2022-04.json",
-      "QmStjhSzMiRUq2T64esc3AdCn5yK6ovArErNrBeJ5GatRU/xdai-snapshot-2022-05.json",
-      "QmRtnaynSgVaEPZ9xWAfwmNi4JNnfxqYx8Qvx8V45Cvvmq/xdai-snapshot-2022-06.json",
-      "QmaasQi77pSMuLg5gq3Kch7yv5Ek8mkwMeb3oqm6gQne1q/xdai-snapshot-2022-07.json",
-      "Qmdy9dXZpRax7zhuPp1cYxz347H5RGcxDAhMSgAQ4Gdiwm/xdai-snapshot-2022-08.json",
-      "QmX9ZkppuUfXaGo2u5NnCEvCoriqZp3VkeCYvmQmbnFoPC/xdai-snapshot-2022-09.json",
-      "QmZKCAZK3RoFkugFBBJRFA4WQccJByEXuXnSATU6pwCgN1/xdai-snapshot-2022-10.json",
-      "QmWS5p6xbqBvJ2GXbM4wDTKzL1hUEvYdzTm6D9syttdVd9/xdai-snapshot-2022-11.json",
-      "QmWFMQB8riKYTfBfdz7n8faExwHC6dAZt1fBA5RriCUshv/xdai-snapshot-2022-12.json",
-      "QmP2dmqWYLq9TU1ysmynBtn4rKqzKLx4MzeL6nNEkZjBQP/xdai-snapshot-2023-01.json",
-      "Qmf1NihFrzywSamyeYLYSCpnY7jG45fWTU2M5rRHLpU8YY/xdai-snapshot-2023-02.json",
-      "QmPkZbPygY5MMU6tTG6xG7esePBg1dUBb9rtNu9nSzzekh/xdai-snapshot-2023-03.json",
-      "QmNV9qreJH7k7KwqsZUXV69Q9gDqaywenJ1B5EiUuwYa7x/xdai-snapshot-2023-04.json",
-      "QmXmGbRFZcuBFuKPjRcuawd55fEYXfsWcM9k2ze48HYzZE/xdai-snapshot-2023-05.json",
-      "QmaMvUbMYtyJVJqV6YCafENrjfN9ULybXRmZTZL7UsTcng/xdai-snapshot-2023-06.json",
-      "QmNgZFkE1dtgPZbHPbGcaq47wsLffJ89Uwtt5Fgf25V7DY/xdai-snapshot-2023-07.json",
-      "QmYCaK3FPJX6S5jkCCLKqNMVDku9vC7RYaSyyC8gPZYvMp/xdai-snapshot-2023-08.json",
-      "QmewZj5jxML23gxkwHGJmAhutso83U7js8tRMoYLqcMQJj/xdai-snapshot-2023-09.json",
-      "QmZkxygbpHdrpWC39PE8k7wEXgGkC7oJddkkzaiEu5bRMV/xdai-snapshot-2023-10.json",
-      "Qma4dBYJedugVM7JFtbBaDuRK2nqULo8bSsSGR7tpdtw5e/xdai-snapshot-2023-11.json",
-      "QmcXxdjPXQpj1uChX7AHM1Q3imEauB7hFW4J2qR74tXBsJ/xdai-snapshot-2023-12.json",
-      "QmddfsZDD2oQLrskJDUk8AmDKJJvHFe3GLE2Zmm1n2rGrq/xdai-snapshot-2024-01.json",
-      "QmdGBZ43WhtTVZNVCtu7fFfsgxoYwPzr8xSJGnFPQEcYcX/xdai-snapshot-2024-02.json",
-      "QmcWw37anHSMcFkuZMZRLZRKMByTNAPUKEM6hQ1bPAZDnn/xdai-snapshot-2024-03.json",
-      "QmUYBkvBEDXLvLtnKBvPCj6fJgTJ9nDQYseU4f1Wo33AY2/xdai-snapshot-2024-04.json",
-      "QmasCmVBzZaxWcSHMc3uhK3ZdwSQXMdX5bdZBaistpXXxX/xdai-snapshot-2024-05.json",
-      "QmPnL6Y3tZABGwKdn6XroBXB4f2FShrmKrdXzGXwfRJEbC/xdai-snapshot-2024-06.json",
-      "QmfPhtSQib6ytndGXeGqE9k4EvaD9g25Zi1HH4JwAzJfpT/xdai-snapshot-2024-07.json",
-      "QmcmDHECzY8YRv65nB6zjt28BYyY6FGSTJc9669JAb7brP/xdai-snapshot-2024-08.json",
-      "QmU4W2w3UFkTP3Biyjx1ecxpaUrC3NpqKhACe7J8jNV197/xdai-snapshot-2024-09.json",
-      "QmTBJ2bYMTE5eMGTtoKJ3ia8ET6wwngwgahaq3wfstCMM1/xdai-snapshot-2024-10.json",
-      "QmPx9ABCPRvFuLDQxeVdV1fPHoDrsm1uH6zMnRNjk2PC7n/xdai-snapshot-2024-11.json",
-      "QmNge4Ei6TWAK3m4GrC21GJc4RbPVE8KBftXrieM4zAgqj/xdai-snapshot-2024-12.json",
-      "QmQhnESLtYoZy4DbjPrFa3x7Mm262jfDTW5b4p4MMccCiw/xdai-snapshot-2025-01.json",
-      "QmXSvhfY5pP8umyBQJJKZUBmuE1mTRP8F2rUiYReM9UMkb/xdai-snapshot-2025-02.json",
-      "QmRXwUA9amrXs6iMCiTDNyZqy8B2UtSRJEjdNowg92Evb6/xdai-snapshot-2025-03.json",
-      "QmVSr6dUpENSMiD5xxgzVXYvUGaHcXq8LRBL5YepmyyeQB/xdai-snapshot-2025-04.json",
-      "QmPFPpZfLBLon7CM16H319PvrhcDAxX3j1rsmoUnZ8mmnH/xdai-snapshot-2025-05.json",
-      "QmZdNdecAhMKKsTy8oPGh13yzhUn8nf8457d87t6d1jWuV/xdai-snapshot-2025-06.json",
-      "QmRWThHmg6eLxNj7m9tpN1w78EaRvUeBoHPhEexrhBaQwg/xdai-snapshot-2025-07.json",
-      "QmU7iEXcvtVJ1j8WAML9CJCU62WXYa5MMgiqqR8rdKeVvt/xdai-snapshot-2025-08.json",
-      "QmUcemx5p2FVxncj9geEkT2DgqMLTjPND2VenaMdibX4zx/xdai-snapshot-2025-09.json",
-      "QmU3JiUbxDwdq7gbKTCjyRgX9YjZV1xY3U9tLgDqyF45C6/xdai-snapshot-2025-10.json",
-      "QmUvjF29Ro4hmFF1RGB5HdpBFQ1NRJJQ3XtUueqcUJPhy6/xdai-snapshot-2025-11.json",
-      "QmTFiPQWCrW6v39BpqTrp6Mjt9wpMWCT6jNYDA4th6wsn9/xdai-snapshot-2025-12.json",
-      "QmULyr78YDTVARGWnSD76NZtMdtmbDufpNmXPk4V5P7XUX/xdai-snapshot-2026-01.json",
-      "QmUiTATfPeNnXcbt8McNKNRcBPRRybTRnds9BfMeHEUSLw/xdai-snapshot-2026-02.json",
-      "QmZzuEGbswT1nU7dCRsLbQZtfZBScGG5QNaUh9pq9T8btB/xdai-snapshot-2026-03.json",
-      "QmNkHRcMG8tToBcuMeerxTfYqFDbF5dv639R3GH6Cbtdfb/xdai-snapshot-2026-04.json",
-      "Qmf8SXvjjBUW3j5NiKatU4qLWcWizDxsC9YAzrXgKzENo4/xdai-snapshot-2026-05.json",
-      "QmfY87DNa7Jh9v3CYcBqiSc1uY8erKgKgQU6zdKgo18iuu/xdai-snapshot-2026-06.json",
-    ],
+    snapshots: snapshotsByChainId["100"],
     blockExplorerBaseUrl: "https://gnosisscan.io",
     klerosboard: klerosboardSubgraph[100],
   },