Merge pull request #1587 from ReflectiveChimp/feat/sort-vaults

Sort vaults by contract address

src/api/stats/getMultichainVaults.ts

@@ -158,23 +158,27 @@ async function updateMultichainVaults() {
 }
 
 function buildFromChains() {
-  multichainVaults = Object.values(vaultsByChain).flat();
+  multichainVaults = sortBy(Object.values(vaultsByChain).flat(), v => v.earnContractAddress.toLowerCase());
   vaultsByID = keyBy(multichainVaults, 'id');
 
   Object.keys(vaultsByChain).forEach(chain => serviceEventBus.emit(`vaults/${chain}/ready`));
   serviceEventBus.emit('vaults/updated');
 }
 
 function buildFromGovChains() {
-  multichainGovVaults = Object.values(govVaultsByChain).flat();
+  multichainGovVaults = sortBy(Object.values(govVaultsByChain).flat(), v =>
+    v.earnContractAddress.toLowerCase()
+  );
   govVaultsById = keyBy(multichainGovVaults, 'id');
 
   Object.keys(multichainGovVaults).forEach(chain => serviceEventBus.emit(`gov-vaults/${chain}/ready`));
   serviceEventBus.emit('gov-vaults/updated');
 }
 
 function buildFromCowChains() {
-  multichainCowVaults = Object.values(cowVaultsByChain).flat();
+  multichainCowVaults = sortBy(Object.values(cowVaultsByChain).flat(), v =>
+    v.earnContractAddress.toLowerCase()
+  );
   cowVaultsById = keyBy(multichainCowVaults, 'id');
 
   Object.keys(multichainCowVaults).forEach(chain => serviceEventBus.emit(`cow-vaults/${chain}/ready`));
@@ -190,15 +194,15 @@ async function updateChainVaults(chain) {
   const vaults = await getVaults(endpoint);
   vaults.forEach(vault => (vault.chain = chain));
 
-  let chainVaults = vaults.filter(vault => vault.type === 'standard');
+  let chainVaults: Vault[] = vaults.filter(vault => vault.type === 'standard');
   chainVaults = await getStrategies(chainVaults, chain);
   chainVaults = await getLastHarvests(chainVaults, chain);
   chainVaults = await fetchChainVaultsPpfs(chainVaults, chain);
 
-  let govVaults = vaults.filter(vault => vault.type === 'gov');
+  let govVaults: GovVault[] = vaults.filter(vault => vault.type === 'gov');
   govVaults = await getGovVaultsTotalSupply(govVaults, chain);
 
-  let cowVaults = vaults.filter(vault => vault.type === 'cowcentrated');
+  let cowVaults: CowVault[] = vaults.filter(vault => vault.type === 'cowcentrated');
   cowVaults = await getStrategies(cowVaults, chain);
   cowVaults = await getLastHarvests(cowVaults, chain);
 
@@ -210,9 +214,9 @@ async function updateChainVaults(chain) {
     }
   }
 
-  vaultsByChain[chain] = chainVaults;
-  govVaultsByChain[chain] = govVaults;
-  cowVaultsByChain[chain] = cowVaults;
+  vaultsByChain[chain] = sortBy(chainVaults, v => v.earnContractAddress.toLowerCase());
+  govVaultsByChain[chain] = sortBy(govVaults, v => v.earnContractAddress.toLowerCase());
+  cowVaultsByChain[chain] = sortBy(cowVaults, v => v.earnContractAddress.toLowerCase());
 
   if (LOG_PER_CHAIN) {
     console.log(`> updated vaults on ${chain} - ${chainVaults.length}`);

src/api/vaults/types.ts

@@ -58,6 +58,7 @@ export type GovVault = {
   retiredAt?: number | undefined;
   totalSupply: number;
   chain: ApiChain;
+  lastHarvest?: number; // for CLM Pools only (copied from CLM base)
 };
 
 export type CowVault = {

src/constants.ts

@@ -253,7 +253,6 @@ const MULTICHAIN_ENDPOINTS: Partial<Record<ApiChain, string>> = {
   sei: SEI_VAULTS_ENDPOINT,
   rootstock: ROOTSTOCK_VAULTS_ENDPOINT,
   scroll: SCROLL_VAULTS_ENDPOINT,
-  // lisk: LISK_VAULTS_ENDPOINT,
   lisk: LISK_VAULTS_ENDPOINT,
 } as const;
 
@@ -380,5 +379,5 @@ export {
   SCROLL_VAULTS_ENDPOINT,
   LISK_RPC,
   LISK_CHAIN_ID,
-  // LISK_VAULTS_ENDPOINT,
+  LISK_VAULTS_ENDPOINT,
 };