Review of PR #31 (#41)

smol-ninja · PaulRBerg · web-flow · commit 5838dff0fe57 · 2025-06-10T12:33:36.000+01:00
* feat: recursive approach instead of hardcoding protocols
docs: natspec of deployment query
fix: reverts when only chainId is passed in getAll function
chore: adds missing rpc endpoints
fix: tangle native token
feat: adds missing parameters in CompilerSettings type
fix: invalid undefined return when flatMap is used
refactor: alphabetical order of Flow deployments
fix: incorrect isLatest value for older Airdrops deployments
fix: missing zksync broadcasts
script: default just recipe

* refactor: allow chainId in getAll

* refactor: simpler definition for catalog

---------

Co-authored-by: Paul Razvan Berg &lt;prberg@proton.me&gt;
diff --git a/data/lockup/v2.0/broadcasts-zk/zksync/LockupNFTDescriptor.json b/data/lockup/v2.0/broadcasts-zk/zksync/LockupNFTDescriptor.json
diff --git a/data/lockup/v2.0/broadcasts-zk/zksync/NFTSVG.json b/data/lockup/v2.0/broadcasts-zk/zksync/NFTSVG.json
@@ -0,0 +1,16 @@
+{
+  "sourceName": "contracts/libraries/NFTSVG.sol",
+  "contractName": "NFTSVG",
+  "abi": [],
+  "bytecode": "0x00000001002001900000000c0000613d0000008001000039000000400010043f0000000001000416000000000001004b0000000c0000c13d00000020010000390000010000100443000001200000044300000005010000410000000f0001042e000000000100001900000010000104300000000e000004320000000f0001042e000000100001043000000000000000000000000000000000000000000000000000000002000000000000000000000000000000400000010000000000000000001ec8195dfdef4cc4ed46daf39c66b25ed24accb7f0de432a3554f27648374221",
+  "entries": [
+    {
+      "constructorArgs": [],
+      "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "deploymentType": "create",
+      "factoryDeps": [],
+      "address": "0x85599b3Dc35bed947F6D576B9516efcc184a2A87",
+      "txHash": "0xf6672f58543e35ddcf0679a5ded54af49cf2a8abd6491ec0384042991b541039"
+    }
+  ]
+}
diff --git a/data/lockup/v2.0/broadcasts-zk/zksync/SVGElements.json b/data/lockup/v2.0/broadcasts-zk/zksync/SVGElements.json
@@ -0,0 +1,16 @@
+{
+  "sourceName": "contracts/libraries/SVGElements.sol",
+  "contractName": "SVGElements",
+  "abi": [],
+  "bytecode": "0x00000001002001900000000c0000613d0000008001000039000000400010043f0000000001000416000000000001004b0000000c0000c13d00000020010000390000010000100443000001200000044300000005010000410000000f0001042e000000000100001900000010000104300000000e000004320000000f0001042e000000100001043000000000000000000000000000000000000000000000000000000002000000000000000000000000000000400000010000000000000000003b528a507542029c3f4b04cd03fba069c09be44a8d7788048efaafbd3a048797",
+  "entries": [
+    {
+      "constructorArgs": [],
+      "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "deploymentType": "create",
+      "factoryDeps": [],
+      "address": "0x08d31504C1f7d070c5C33ab30B9d177481ca8300",
+      "txHash": "0xa6c9c36589a7b43756cdea252180cfeb54301ecf3707a7d0c96ec99893019403"
+    }
+  ]
+}
diff --git a/data/lockup/v2.0/broadcasts-zk/zksync/SablierBatchLockup.json b/data/lockup/v2.0/broadcasts-zk/zksync/SablierBatchLockup.json
diff --git a/data/lockup/v2.0/broadcasts-zk/zksync/SablierLockup.json b/data/lockup/v2.0/broadcasts-zk/zksync/SablierLockup.json
diff --git a/justfile b/justfile
@@ -5,7 +5,8 @@ set shell := ["bash", "-euo", "pipefail", "-c"]
 # ---------------------------------------------------------------------------- #
 
 # Default recipe
-default: full-check
+default:
+    just --list
 
 # Check code with Biome
 biome-check:
diff --git a/src/chains/config.ts b/src/chains/config.ts
@@ -3,8 +3,8 @@ import type { Chain as ViemChain } from "viem/chains";
 import * as viem from "viem/chains";
 import { alchemyRPCs, infuraRPCs } from "./rpc";
 
-type ConfigString = { [chainId: number]: string };
 type ConfigBool = { [chainId: number]: boolean };
+type ConfigString = { [chainId: number]: string };
 
 export const config = {
   slugs: {
diff --git a/src/chains/mainnets.ts b/src/chains/mainnets.ts
@@ -53,8 +53,8 @@ export const tangle: Sablier.Chain = fill(
     name: "Tangle",
     nativeCurrency: {
       decimals: 18,
-      name: "Ether",
-      symbol: "ETH",
+      name: "Tangle",
+      symbol: "TNT",
     },
     rpc: {
       public: "https://rpc.tangle.tools",
diff --git a/src/contracts/queries.ts b/src/contracts/queries.ts
@@ -5,10 +5,9 @@ import { catalog } from "./catalog";
 
 export const contractsQueries = {
   /**
-   * Get a single contract by name or by address.
-   * - {name, deployment}
-   * - {name, release, chainId}
-   * - {address}
+   * Get a single contract using the following options:
+   * - { chainId, name, release }
+   * - { chainId, address, protocol }
    */
   get: (opts: {
     chainId: number;
diff --git a/src/releases/airdrops/v1.1/index.ts b/src/releases/airdrops/v1.1/index.ts
@@ -9,7 +9,7 @@ export const deployments: Sablier.Deployment[] = [...mainnets, ...testnets];
 export const release = resolvers.release.standard({
   aliases,
   deployments: deployments,
-  isLatest: true,
+  isLatest: false,
   manifest: manifest,
   protocol: Protocol.Airdrops,
   version: "v1.1",
diff --git a/src/releases/airdrops/v1.2/index.ts b/src/releases/airdrops/v1.2/index.ts
@@ -10,7 +10,7 @@ export const deployments: Sablier.Deployment[] = [...mainnets, ...testnets];
 export const release = resolvers.release.standard({
   aliases,
   deployments: deployments,
-  isLatest: true,
+  isLatest: false,
   manifest: manifest,
   protocol: Protocol.Airdrops,
   version: "v1.2",
diff --git a/src/releases/flow/v1.0/deployments.ts b/src/releases/flow/v1.0/deployments.ts
@@ -20,92 +20,92 @@ function get(chainId: number, contractMap: Sablier.ContractMap): Sablier.Deploym
  */
 export const mainnets: Sablier.Deployment[] = [
   get(chains.abstract.id, {
-    [manifest.SABLIER_FLOW]: ["0x001F1408515Ccd5C1A19A682455ed4eFa39DadD6", 73_630],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x20C9A3E27322Fc2b21Ced430D1B2e12d90804db6",
+    [manifest.SABLIER_FLOW]: ["0x001F1408515Ccd5C1A19A682455ed4eFa39DadD6", 73_630],
   }),
   get(chains.arbitrum.id, {
-    [manifest.SABLIER_FLOW]: ["0x18a12a7035aa56240bcd236bc019aa245dcc015a", 281_305_357],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x900ebdb9ecfb19f9463d68d1fd6e5fa7ab9c6897",
+    [manifest.SABLIER_FLOW]: ["0x18a12a7035aa56240bcd236bc019aa245dcc015a", 281_305_357],
   }),
   get(chains.avalanche.id, {
-    [manifest.SABLIER_FLOW]: ["0x8c172e42c06302e3cfe555dc4d6b71a756ee186b", 53_922_039],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x82ea83ab59b106c125168492cd468c322bd0d195",
+    [manifest.SABLIER_FLOW]: ["0x8c172e42c06302e3cfe555dc4d6b71a756ee186b", 53_922_039],
   }),
   get(chains.base.id, {
-    [manifest.SABLIER_FLOW]: ["0x1a9adc0e2114c8407cc31669baafeee031d15dd2", 23_269_999],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x8e64f389a4697e004647162ec6ea0a7779d5d899",
+    [manifest.SABLIER_FLOW]: ["0x1a9adc0e2114c8407cc31669baafeee031d15dd2", 23_269_999],
   }),
   get(chains.blast.id, {
-    [manifest.SABLIER_FLOW]: ["0xfdac2799644141856e20e021ac06f231cafc731f", 12_259_771],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xb40624ce2af67227529f713bac46e2b7064b7b92",
+    [manifest.SABLIER_FLOW]: ["0xfdac2799644141856e20e021ac06f231cafc731f", 12_259_771],
   }),
   get(chains.bsc.id, {
-    [manifest.SABLIER_FLOW]: ["0xfce01f79247cf450062545e7155d7bd568551d0e", 44_582_847],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xbc6fdd3f59900b9fcd445f8df159e2e794f098ec",
+    [manifest.SABLIER_FLOW]: ["0xfce01f79247cf450062545e7155d7bd568551d0e", 44_582_847],
   }),
   get(chains.chiliz.id, {
-    [manifest.SABLIER_FLOW]: ["0x9EfC8663cAB0e2d97ad17C9fbfc8392445517E94", 19_125_673],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x3D664B2Da905DDD0Db931982FD9a759ea950D6e1",
+    [manifest.SABLIER_FLOW]: ["0x9EfC8663cAB0e2d97ad17C9fbfc8392445517E94", 19_125_673],
   }),
   get(chains.coreDao.id, {
-    [manifest.SABLIER_FLOW]: ["0x447c6ea25540611541ff98fc677ca865f4e92450", 20_009_229],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xbfaa055ecfe503e1323dc9fc26b7d3aa3bf54364",
+    [manifest.SABLIER_FLOW]: ["0x447c6ea25540611541ff98fc677ca865f4e92450", 20_009_229],
   }),
   get(chains.ethereum.id, {
-    [manifest.SABLIER_FLOW]: ["0x2d9221a63e12aa796619cb381ec4a71b201281f5", 21_330_577],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xb69b27073fa0366cddf432f5976c34c9baf7eae6",
+    [manifest.SABLIER_FLOW]: ["0x2d9221a63e12aa796619cb381ec4a71b201281f5", 21_330_577],
   }),
   get(chains.gnosis.id, {
-    [manifest.SABLIER_FLOW]: ["0x5515f774a4db42820802333ba575f68a6e85bd13", 37_356_094],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xc07c1128c19c2bf303b68ae061eff5293927630e",
+    [manifest.SABLIER_FLOW]: ["0x5515f774a4db42820802333ba575f68a6e85bd13", 37_356_094],
   }),
   get(chains.iotex.id, {
-    [manifest.SABLIER_FLOW]: ["0x1DdC1c21CD39c2Fa16366E6036c95342A31831Ba", 33_533_023],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x83Dd52FCA44E069020b58155b761A590F12B59d3",
+    [manifest.SABLIER_FLOW]: ["0x1DdC1c21CD39c2Fa16366E6036c95342A31831Ba", 33_533_023],
   }),
   get(chains.lightlink.id, {
-    [manifest.SABLIER_FLOW]: ["0x46fa0164c5af9382d330e5a245a2ca8a18398950", 116_397_460],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xa2a48b83b6c96e1536336df9ead024d557a97a23",
+    [manifest.SABLIER_FLOW]: ["0x46fa0164c5af9382d330e5a245a2ca8a18398950", 116_397_460],
   }),
   get(chains.linea.id, {
-    [manifest.SABLIER_FLOW]: ["0x949bFa08f1632432A2656a9dB17CA34d54Da8296", 12_929_891],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xF430f0d2f798c42fDFAc35b5e32BD4f63Bf51130",
+    [manifest.SABLIER_FLOW]: ["0x949bFa08f1632432A2656a9dB17CA34d54Da8296", 12_929_891],
   }),
   get(chains.mode.id, {
-    [manifest.SABLIER_FLOW]: ["0x75970dde488431fc4961494569def3269f20d6b3", 16_616_938],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x46fa0164c5af9382d330e5a245a2ca8a18398950",
+    [manifest.SABLIER_FLOW]: ["0x75970dde488431fc4961494569def3269f20d6b3", 16_616_938],
   }),
   get(chains.morph.id, {
-    [manifest.SABLIER_FLOW]: ["0xfe6972d0ae797fae343e5a58d0c7d8513937f092", 980_797],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xab281bbc2bc34a1f202ddff17ffd1c00edf73f3a",
+    [manifest.SABLIER_FLOW]: ["0xfe6972d0ae797fae343e5a58d0c7d8513937f092", 980_797],
   }),
   get(chains.optimism.id, {
-    [manifest.SABLIER_FLOW]: ["0x906356e4e6410ea0a97dbc5b071cf394ab0dcd69", 128_865_315],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xe674fb603d6f72b88bf297c1ba69f57b588a8f6d",
+    [manifest.SABLIER_FLOW]: ["0x906356e4e6410ea0a97dbc5b071cf394ab0dcd69", 128_865_315],
   }),
   get(chains.polygon.id, {
-    [manifest.SABLIER_FLOW]: ["0xcf2d812d5aad4e6fec3b05850ff056b21159d496", 65_079_319],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x011277c87158e52cfbd8a1dd4a29118d602dda3a",
+    [manifest.SABLIER_FLOW]: ["0xcf2d812d5aad4e6fec3b05850ff056b21159d496", 65_079_319],
   }),
   get(chains.scroll.id, {
-    [manifest.SABLIER_FLOW]: ["0x66826f53bffeaab71adc7fe1a77e86f8268848d8", 11_643_209],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x57fd892b3dc20eadb83cd8fb0240a87960046daa",
+    [manifest.SABLIER_FLOW]: ["0x66826f53bffeaab71adc7fe1a77e86f8268848d8", 11_643_209],
   }),
   get(chains.superseed.id, {
-    [manifest.SABLIER_FLOW]: ["0x4f5f9b3fb57bba43aaf90e3f71d8f8f384e88e20", 3_610_744],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xac2c36347869d8d779f7872c6202de3efd6ef2bb",
+    [manifest.SABLIER_FLOW]: ["0x4f5f9b3fb57bba43aaf90e3f71d8f8f384e88e20", 3_610_744],
   }),
   get(chains.taiko.id, {
-    [manifest.SABLIER_FLOW]: ["0x3d303e4c61285f87da9f61aaadc8c89b7d55dfa2", 638_376],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xe790b6178612eeba6faeec16a2e1354c872f8bde",
+    [manifest.SABLIER_FLOW]: ["0x3d303e4c61285f87da9f61aaadc8c89b7d55dfa2", 638_376],
   }),
   get(chains.tangle.id, {
-    [manifest.SABLIER_FLOW]: ["0xCff4a803b0Bf55dD1BE38Fb96088478F3D2eeCF2", 3296266],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x2De92156000269fa2fde7544F10f01E8cBC80fFa",
+    [manifest.SABLIER_FLOW]: ["0xCff4a803b0Bf55dD1BE38Fb96088478F3D2eeCF2", 3296266],
   }),
   get(chains.zksync.id, {
-    [manifest.SABLIER_FLOW]: ["0x015899a075B7C181e357Cd0ed000683DBB4F1FcE", 50_572_220],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x01C40608f2822816cF25a0a911c1df330487ba62",
+    [manifest.SABLIER_FLOW]: ["0x015899a075B7C181e357Cd0ed000683DBB4F1FcE", 50_572_220],
   }),
 ];
 
@@ -114,47 +114,47 @@ export const mainnets: Sablier.Deployment[] = [
  */
 export const testnets: Sablier.Deployment[] = [
   get(chains.arbitrumSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0x781b3b2527f2a0a1e6b429161f2717a8a28b9f46", 103_460_016],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x9a08e6ae67c28002ee2c7cff9badecd33ae2151c",
+    [manifest.SABLIER_FLOW]: ["0x781b3b2527f2a0a1e6b429161f2717a8a28b9f46", 103_460_016],
   }),
   get(chains.baseSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0xd5f78708d83ac2bc8734a8cdf2d112c1bb3b62a2", 18_780_695],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x168ad0b246f604bc70bef87ecde585c3f1d49617",
+    [manifest.SABLIER_FLOW]: ["0xd5f78708d83ac2bc8734a8cdf2d112c1bb3b62a2", 18_780_695],
   }),
   get(chains.blastSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0xa8c864c53e72301c2ab484d013627a5a7084174b", 14_321_690],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x567a95aa72a23b924f79dfa437d28c38740e144c",
+    [manifest.SABLIER_FLOW]: ["0xa8c864c53e72301c2ab484d013627a5a7084174b", 14_321_690],
   }),
   get(chains.ethereumSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0x5ae8c13f6ae094887322012425b34b0919097d8a", 7_210_716],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xbc4da2fbdfe5c5eaa11bd0e282201e2abf40b1ee",
+    [manifest.SABLIER_FLOW]: ["0x5ae8c13f6ae094887322012425b34b0919097d8a", 7_210_716],
   }),
   get(chains.lineaSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0xb0255ed1ee5c01dfe865c1b21bbf56a80f9ae739", 6_731_428],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xcd8871a22640c57ba36984fb57e9c794f5df7f40",
+    [manifest.SABLIER_FLOW]: ["0xb0255ed1ee5c01dfe865c1b21bbf56a80f9ae739", 6_731_428],
   }),
   get(chains.modeTestnet.id, {
-    [manifest.SABLIER_FLOW]: ["0xf5ac60870e1ccc4bfce23cfbb7a796a0d8dbaf47", 22_766_790],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x1cae76b71913598d7664d16641ccb6037d8ed61a",
+    [manifest.SABLIER_FLOW]: ["0xf5ac60870e1ccc4bfce23cfbb7a796a0d8dbaf47", 22_766_790],
   }),
   get(chains.morphHolesky.id, {
-    [manifest.SABLIER_FLOW]: ["0x9efc8663cab0e2d97ad17c9fbfc8392445517e94", 13_920_154],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x3d664b2da905ddd0db931982fd9a759ea950d6e1",
+    [manifest.SABLIER_FLOW]: ["0x9efc8663cab0e2d97ad17c9fbfc8392445517e94", 13_920_154],
   }),
   get(chains.optimismSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0x417db0f2bd020fc4d6bccea6b2bb6be0c541862e", 20_763_576],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x28401987a23ed9b8926b07f3b6855222a70c2128",
+    [manifest.SABLIER_FLOW]: ["0x417db0f2bd020fc4d6bccea6b2bb6be0c541862e", 20_763_576],
   }),
   get(chains.superseedSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0x905756b52efeaf75f6b1bb1bb0fc35eea15ae260", 11_235_331],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xc43fb9fe4477d8e8bf68b9fd3a0163a4cffcbb31",
+    [manifest.SABLIER_FLOW]: ["0x905756b52efeaf75f6b1bb1bb0fc35eea15ae260", 11_235_331],
   }),
   get(chains.taikoHekla.id, {
-    [manifest.SABLIER_FLOW]: ["0x29b7bafce0a04638dc91ca0b87a562cab8c3dbde", 1_022_270],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0xd45f45dd34045a368854f7987a84d9485b4b45e9",
+    [manifest.SABLIER_FLOW]: ["0x29b7bafce0a04638dc91ca0b87a562cab8c3dbde", 1_022_270],
   }),
   get(chains.zksyncSepolia.id, {
-    [manifest.SABLIER_FLOW]: ["0x8e70296F8972eBE94d885B1Caf94Da4836976140", 4_276_904],
     [manifest.FLOW_NFT_DESCRIPTOR]: "0x900277DBB45a04eB79028b3A44c650Ac81Ca86c4",
+    [manifest.SABLIER_FLOW]: ["0x8e70296F8972eBE94d885B1Caf94Da4836976140", 4_276_904],
   }),
 ];
diff --git a/src/releases/queries.ts b/src/releases/queries.ts
@@ -1,3 +1,4 @@
+import { Protocol } from "@src/enums";
 import type { Sablier } from "@src/types";
 import _ from "lodash";
 import { releases } from "./data";
@@ -17,12 +18,8 @@ export const releasesQueries = {
     if (protocol) {
       return _.flatMap(_.values(releases[protocol]));
     }
-    return [
-      ..._.flatMap(_.values(releases.airdrops)),
-      ..._.flatMap(_.values(releases.flow)),
-      ..._.flatMap(_.values(releases.legacy)),
-      ..._.flatMap(_.values(releases.lockup)),
-    ];
+    // Recursively get all releases from all protocols in the enum
+    return _.flatMap(Object.values(Protocol), (protocolName) => _.flatMap(_.values(releases[protocolName])));
   },
   /**
    * Get the first release:
diff --git a/src/sablier.ts b/src/sablier.ts
@@ -30,7 +30,7 @@ const deploymentsQueries = {
     const { release, chainId } = opts || {};
     return _.find(release.deployments, { chainId });
   },
-  getAll: (): Sablier.Deployment[] | undefined => {
+  getAll: (): Sablier.Deployment[] => {
     return _.flatMap(releasesQueries.getAll(), (r) => r.deployments);
   },
 };
diff --git a/src/types.ts b/src/types.ts
@@ -20,7 +20,7 @@ export namespace Sablier {
     isSupportedByUI: boolean;
     /** Whether this is a testnet network. */
     isTestnet: boolean;
-    /** Whether this is a zkVM like zkSync. */
+    /** Whether this is a zkEVM like zkSync. */
     isZK: boolean;
     rpc: {
       /** Alchemy RPC URL generator. */
@@ -44,11 +44,20 @@ export namespace Sablier {
   };
 
   export type CompilerSettings = {
+    /** The EVM version such as shanghai, paris, etc. */
     evmVersion: string;
+    /** Whether the optimizer is enabled. */
     optimizer: boolean;
+    /** The number of optimizer runs. */
     optimizerRuns: number;
-    version: `v${number}.${number}.${number}`;
+    /** Optional salt used for CREATE2 deployment. None implies deployment using CREATE. */
+    salt?: string;
+    /** The solc version used. */
+    solcVersion: `v${number}.${number}.${number}`;
+    /** Whether the IR is used. */
     viaIR: boolean;
+    /** Optional zk version used, only valid for zkEVM chains. */
+    zkVersion?: `v${number}.${number}.${number}`;
   };
 
   /**
@@ -89,11 +98,7 @@ export namespace Sablier {
     [contractName: string]: Address | [Address, number];
   };
 
-  export type Protocol =
-    | typeof Protocol.Airdrops
-    | typeof Protocol.Flow
-    | typeof Protocol.Legacy
-    | typeof Protocol.Lockup;
+  export type Protocol = (typeof Protocol)[keyof typeof Protocol];
 
   export type Repository = {
     commit: string;
@@ -107,7 +112,7 @@ export namespace Sablier {
     export type Standard = {
       chainId: number;
       contracts: Contract[];
-      /** @todo: Compiler settings for the contract. Not implemented yet.*/
+      /** TODO: Compiler settings for the contract. Not implemented yet. */
       compilerSettings?: CompilerSettings;
     };
 
@@ -181,7 +186,7 @@ export namespace Sablier {
    */
   export namespace Release {
     type Common = {
-      /** A map of contract names to their aliases, used in the Sablier Interface and the TheGraphs. */
+      /** A map of contract names to their aliases, used in the Sablier Interface and the Graph. */
       aliases?: AliasMap;
       /** An array of contract names. */
       contractNames: string[];
@@ -217,17 +222,13 @@ export namespace Sablier {
   export type Release = Release.Standard | Release.LockupV1;
 
   export namespace Version {
-    export type Airdrops = typeof Version.Airdrops.V1_1 | typeof Version.Airdrops.V1_2 | typeof Version.Airdrops.V1_3;
+    export type Airdrops = (typeof Version.Airdrops)[keyof typeof Version.Airdrops];
 
-    export type Flow = typeof Version.Flow.V1_0 | typeof Version.Flow.V1_1;
+    export type Flow = (typeof Version.Flow)[keyof typeof Version.Flow];
 
-    export type Legacy = typeof Version.Legacy.V1_0 | typeof Version.Legacy.V1_1;
+    export type Legacy = (typeof Version.Legacy)[keyof typeof Version.Legacy];
 
-    export type Lockup =
-      | typeof Version.Lockup.V1_0
-      | typeof Version.Lockup.V1_1
-      | typeof Version.Lockup.V1_2
-      | typeof Version.Lockup.V2_0;
+    export type Lockup = (typeof Version.Lockup)[keyof typeof Version.Lockup];
   }
 
   export type Version = Version.Airdrops | Version.Flow | Version.Legacy | Version.Lockup;
