Sablier updates (DefiLlama#12815)

Author: PaulRBerg

projects/sablier/index.js renamed to projects/sablier-legacy/index.js

@@ -11,6 +11,20 @@ const blacklistedTokens = [
   ADDRESSES.ethereum.MKR,
 ]
 
+const config = {
+  ethereum: {
+    owners: [
+      "0xA4fc358455Febe425536fd1878bE67FfDBDEC59a", // v1.0.0
+      "0xCD18eAa163733Da39c232722cBC4E8940b1D8888", // v1.1.0
+    ]
+  },
+  arbitrum: { owners: ['0xaDB944B478818d95659067E70D2e5Fc43Fa3eDe9'], },
+  avax: { owners: ['0x73f503fad13203C87889c3D5c567550b2d41D7a4'], },
+  bsc: { owners: ['0x05BC7f5fb7F248d44d38703e5C921A8c16825161'], },
+  optimism: { owners: ['0x6C5927c0679e6d857E87367bb635decbcB20F31c'], },
+  polygon: { owners: ['0xAC18EAB6592F5fF6F9aCf5E0DCE0Df8E49124C06'], },
+}
+
 async function getTokens(api, owners, isVesting) {
   let tokens = (await Promise.all(owners.map(i => covalentGetTokens(i, api, { onlyWhitelisted: false, })))).flat().filter(i => !blacklistedTokens.includes(i))
   tokens = getUniqueAddresses(tokens)
@@ -20,8 +34,11 @@ async function getTokens(api, owners, isVesting) {
     const symbol = symbols[index];
     return symbol ? { token, symbol } : null;
   }).filter(pair => pair !== null);
-
-  return validTokens.filter(token => isWhitelistedToken(token.symbol, token.token, isVesting)).map(token => token.token);
+  // Filter vesting tokens
+  const whitelistedTokens = validTokens.filter(token => {
+    return isWhitelistedToken(token.symbol, token.token, isVesting);
+  });
+  return whitelistedTokens.map(token => token.token);
 }
 
 async function tvl(api) {
@@ -54,20 +71,6 @@ module.exports = {
   }
 };
 
-const config = {
-  ethereum: {
-    owners: [
-      "0xA4fc358455Febe425536fd1878bE67FfDBDEC59a", // v1.0.0
-      "0xCD18eAa163733Da39c232722cBC4E8940b1D8888", // v1.1.0
-    ]
-  },
-  arbitrum: { owners: ['0xaDB944B478818d95659067E70D2e5Fc43Fa3eDe9'], },
-  avax: { owners: ['0x73f503fad13203C87889c3D5c567550b2d41D7a4'], },
-  bsc: { owners: ['0x05BC7f5fb7F248d44d38703e5C921A8c16825161'], },
-  optimism: { owners: ['0x6C5927c0679e6d857E87367bb635decbcB20F31c'], },
-  polygon: { owners: ['0xAC18EAB6592F5fF6F9aCf5E0DCE0Df8E49124C06'], },
-}
-
 Object.keys(config).forEach(chain => {
   module.exports[chain] = { tvl, vesting }
 })

projects/sablier-v2/index.js renamed to projects/sablier-lockup/index.js

@@ -1,6 +1,23 @@
 const { isWhitelistedToken } = require('../helper/streamingHelper')
 const { cachedGraphQuery } = require('../helper/cache')
 
+const config = {
+  arbitrum: { endpoints: ['8BnGPBojHycDxVo83LP468pUo4xDyCQbtTpHGZXR6SiB'], },
+  base: { endpoints: ['3pxjsW9rbDjmZpoQWzc5CAo4vzcyYE9YQyTghntmnb1K'], },
+  blast: { endpoints: ['BXoC2ToMZXnTmCjWftQRPh9zMyM7ysijMN54Nxzb2CEY'], },
+  avax: { endpoints: ['FdVwZuMV43yCb1nPmjnLQwmzS58wvKuLMPzcZ4UWgWAc'], },
+  era: { endpoints: ['GY2fGozmfZiZ3xF2MfevohLR4YGnyxGxAyxzi9zmU5bY'], },
+  bsc: { endpoints: ['BVyi15zcH5eUg5PPKfRDDesezMezh6cAkn8LPvh7MVAF'], },
+  ethereum: { endpoints: ['5EgaXheiBXZBCkepyGUYAu8pN31Dkbh7bpGtnLPqaT5m'], },
+  linea: { endpoints: ['FoJnatzCZKyp9XjZyUBaw1juTb5ydnFvJvWUxS3oRCHZ'], },
+  mode: { endpoints: ['5ezGnVwNucVTW45WCb91VBiKBEdiqT4ceHDhh1KGigYG'], },
+  optimism: { endpoints: ['6e6Dvs1yDpsWDDREZRqxGi54SVdvTNzUdKpKJxniKVrp'], },
+  polygon: { endpoints: ['CsDNYv9XPUMP8vufuwDVKQrVhsxhzzRHezjLFFKZZbrx'], },
+  scroll: { endpoints: ['HVcngokCByfveLwguuafrBC34xB65Ne6tpGrXHmqDSrh'], },
+  xdai: { endpoints: ['EXhNLbhCbsewJPx4jx5tutNXpxwdgng2kmX1J7w1bFyu'], },
+}
+
+
 async function getTokensConfig(api, isVesting) {
   const ownerTokens = []
   const { endpoints } = config[api.chain]
@@ -14,6 +31,7 @@ async function getTokensConfig(api, isVesting) {
     const owners = contracts.map(i => i.address)
     let tokens = assets.map(i => i.id)
     const symbols = assets.map(i => i.symbol)
+    // Filter vesting tokens
     tokens = tokens.filter((v, i) => isWhitelistedToken(symbols[i], v, isVesting))
     owners.forEach(owner => ownerTokens.push([tokens, owner]))
   }
@@ -29,22 +47,6 @@ async function vesting(api) {
   return api.sumTokens(await getTokensConfig(api, true))
 }
 
-const config = {
-  ethereum: { endpoints: ['5EgaXheiBXZBCkepyGUYAu8pN31Dkbh7bpGtnLPqaT5m'], },
-  arbitrum: { endpoints: ['8BnGPBojHycDxVo83LP468pUo4xDyCQbtTpHGZXR6SiB'], },
-  bsc: { endpoints: ['BVyi15zcH5eUg5PPKfRDDesezMezh6cAkn8LPvh7MVAF'], },
-  xdai: { endpoints: ['EXhNLbhCbsewJPx4jx5tutNXpxwdgng2kmX1J7w1bFyu'], },
-  optimism: { endpoints: ['6e6Dvs1yDpsWDDREZRqxGi54SVdvTNzUdKpKJxniKVrp'], },
-  polygon: { endpoints: ['CsDNYv9XPUMP8vufuwDVKQrVhsxhzzRHezjLFFKZZbrx'], },
-  avax: { endpoints: ['FdVwZuMV43yCb1nPmjnLQwmzS58wvKuLMPzcZ4UWgWAc'], },
-  base: { endpoints: ['3pxjsW9rbDjmZpoQWzc5CAo4vzcyYE9YQyTghntmnb1K'], },
-  blast: { endpoints: ['BXoC2ToMZXnTmCjWftQRPh9zMyM7ysijMN54Nxzb2CEY'], },
-  scroll: { endpoints: ['HVcngokCByfveLwguuafrBC34xB65Ne6tpGrXHmqDSrh'], },
-  era: { endpoints: ['GY2fGozmfZiZ3xF2MfevohLR4YGnyxGxAyxzi9zmU5bY'], },
-  mode: { endpoints: ['5ezGnVwNucVTW45WCb91VBiKBEdiqT4ceHDhh1KGigYG'], },
-  linea: { endpoints: ['FoJnatzCZKyp9XjZyUBaw1juTb5ydnFvJvWUxS3oRCHZ'], },
-}
-
 Object.keys(config).forEach(chain => {
   module.exports[chain] = { tvl, vesting }
 })