Add support for solidly veNfts (DefiLlama#9138)

* add support to unwrap solidly veNfts

* update inverse treasury with veNFTs

* refacto tangible with unwrapSolidlyVeNft util

Author: webmass

projects/helper/abis/solidlyVeNft.json

@@ -0,0 +1,7 @@
+{
+    "tokensOfOwner": "function tokensOfOwner(address) view returns (uint256[])",
+    "ownerToNFTokenIdList": "function ownerToNFTokenIdList(address, uint256) view returns (uint256)",
+    "tokenOfOwnerByIndex": "function tokenOfOwnerByIndex(address _owner, uint256 _tokenIndex) view returns (uint256)",
+    "locked": "function locked(uint256 _tokenId) view returns (tuple(int128 amount, uint256 end, bool isPermanent))",
+    "lockedSimple": "function locked(uint256 _tokenId) view returns (tuple(int128 amount, uint256 end))"
+}

projects/helper/unwrapLPs.js

@@ -8,10 +8,11 @@ const { requery } = require('./requery')
 const { getChainTransform, getFixBalances } = require('./portedTokens')
 const { getUniqueAddresses, normalizeAddress } = require('./tokenMapping')
 const creamAbi = require('./abis/cream.json')
-const { isLP, log, sliceIntoChunks, isICHIVaultToken, } = require('./utils')
+const { isLP, log, sliceIntoChunks, isICHIVaultToken, createIncrementArray } = require('./utils')
 const { sumArtBlocks, whitelistedNFTs, } = require('./nft')
 const wildCreditABI = require('../wildcredit/abi.json');
 const { covalentGetTokens, } = require("./token");
+const SOLIDLY_VE_NFT_ABI = require('./abis/solidlyVeNft.json');
 
 const lpReservesAbi = 'function getReserves() view returns (uint112 _reserve0, uint112 _reserve1, uint32 _blockTimestampLast)'
 const lpSuppliesAbi = "uint256:totalSupply"
@@ -697,6 +698,7 @@ async function sumTokens2({
   sumChunkSize = undefined,
   uniV3ExtraConfig = {},
   resolveICHIVault = false,
+  solidlyVeNfts = [],
 }) {
   if (api) {
     chain = api.chain ?? chain
@@ -733,6 +735,14 @@ async function sumTokens2({
     nftTokens.forEach((tokens, i) => ownerTokens.push([[tokens, coreNftTokens].flat(), owners[i]]))
   }
 
+  if(solidlyVeNfts.length) {
+    await Promise.all(
+      owners.map(
+        owner => solidlyVeNfts.map(veNftDetails => unwrapSolidlyVeNft({ api, owner, ...veNftDetails  }))
+      )
+      .flat()
+    )
+  }
 
   if (ownerTokens.length) {
     ownerTokens.map(([tokens, owner]) => {
@@ -901,6 +911,20 @@ async function unwrapConvexRewardPools({ api, tokensAndOwners }) {
   return api.getBalances()
 }
 
+async function unwrapSolidlyVeNft({ api, baseToken, veNft, owner, hasTokensOfOwnerAbi = false, isAltAbi = false, lockedAbi, nftIdGetterAbi }) {
+  let tokenIds
+  const _lockedAbi = lockedAbi || (hasTokensOfOwnerAbi || isAltAbi ? SOLIDLY_VE_NFT_ABI.lockedSimple : SOLIDLY_VE_NFT_ABI.locked)
+  const _nftIdGetterAbi = nftIdGetterAbi || (isAltAbi ? SOLIDLY_VE_NFT_ABI.tokenOfOwnerByIndex : SOLIDLY_VE_NFT_ABI.ownerToNFTokenIdList)
+  if(hasTokensOfOwnerAbi) {
+    tokenIds = await api.call({ abi: SOLIDLY_VE_NFT_ABI.tokensOfOwner, params: owner, target: veNft })
+  } else {
+    const count = await api.call({ abi: 'erc20:balanceOf', target: veNft, params: owner })
+    tokenIds = await api.multiCall({ abi: _nftIdGetterAbi, calls: createIncrementArray(count).map(i => ({ params: [owner, i] })), target: veNft })
+  }  
+  const bals = await api.multiCall({ abi: _lockedAbi, calls: tokenIds, target: veNft })
+  bals.forEach(i => api.add(baseToken, i.amount))  
+}
+
 module.exports = {
   PANCAKE_NFT_ADDRESS,
   unwrapUniswapLPs,
@@ -925,4 +949,5 @@ module.exports = {
   unwrapMakerPositions,
   unwrap4626Tokens,
   unwrapConvexRewardPools,
+  unwrapSolidlyVeNft,
 }

projects/tangible/insurance-fund-base.js

@@ -1,5 +1,4 @@
-const VE_VELO_ABI = require('./abi/VeVeloNFT.json');
-const { createIncrementArray } = require('../helper/utils');
+const { unwrapSolidlyVeNft } = require('../helper/unwrapLPs');
 
 const insuranceTokensBase = {
   AERO: '0x940181a94A35A4569E4529A3CDfB74e38FD98631',
@@ -8,10 +7,7 @@ const insuranceTokensBase = {
 const VE_AERO_NFT = "0xeBf418Fe2512e7E6bd9b87a8F0f294aCDC67e6B4";
 
 async function getInsuranceFundValueBase(api, INSURANCE_FUND) {
-  const count = await api.call({ abi: 'erc20:balanceOf', target: VE_AERO_NFT, params: INSURANCE_FUND })
-  const tokenIds = await api.multiCall({ abi: VE_VELO_ABI.ownerToNFTokenIdList, calls: createIncrementArray(count).map(i => ({ params: [INSURANCE_FUND, i] })), target: VE_AERO_NFT })
-  const bals = await api.multiCall({ abi: VE_VELO_ABI.locked, calls: tokenIds, target: VE_AERO_NFT })
-  bals.forEach(i => api.add(insuranceTokensBase.AERO, i.amount))
+  await unwrapSolidlyVeNft({ api, baseToken: insuranceTokensBase.AERO, veNft: VE_AERO_NFT, owner: INSURANCE_FUND })
 }
 
 module.exports = {

projects/tangible/insurance-fund-optimism.js

@@ -1,5 +1,4 @@
-const VE_VELO_ABI = require('./abi/VeVeloNFT.json');
-const { createIncrementArray } = require('../helper/utils');
+const { unwrapSolidlyVeNft } = require('../helper/unwrapLPs');
 
 const insuranceTokensOp = {
   VELO: '0x9560e827af36c94d2ac33a39bce1fe78631088db',
@@ -8,10 +7,7 @@ const insuranceTokensOp = {
 const VE_VELO_NFT = "0xFAf8FD17D9840595845582fCB047DF13f006787d";
 
 async function getInsuranceFundValueOp(api, INSURANCE_FUND) {
-  const count = await api.call({ abi: 'erc20:balanceOf', target: VE_VELO_NFT, params: INSURANCE_FUND })
-  const tokenIds = await api.multiCall({ abi: VE_VELO_ABI.ownerToNFTokenIdList, calls: createIncrementArray(count).map(i => ({ params: [INSURANCE_FUND, i]})), target: VE_VELO_NFT })
-  const bals = await api.multiCall({ abi: VE_VELO_ABI.locked, calls: tokenIds, target: VE_VELO_NFT })
-  bals.forEach(i => api.add(insuranceTokensOp.VELO, i.amount))
+  await unwrapSolidlyVeNft({ api, baseToken: insuranceTokensOp.VELO, veNft: VE_VELO_NFT, owner: INSURANCE_FUND })
 }
 
 module.exports = {

projects/treasury/inverse.js

@@ -3,7 +3,7 @@ const { treasuryExports, nullAddress } = require("../helper/treasury");
 
 const inv = "0x41D5D79431A913C4aE7d69a668ecdfE5fF9DFB68";
 const anchorTreasury = "0x926df14a23be491164dcf93f4c468a50ef659d5b";
-const multisig = "0x9D5Df30F475CEA915b1ed4C0CCa59255C897b61B";
+const treasurymultisig = "0x9D5Df30F475CEA915b1ed4C0CCa59255C897b61B";
 const opmultisig = "0xa283139017a2f5bade8d8e25412c600055d318f8";
 const bnbmultisig = "0xf7da4bc9b7a6bb3653221ae333a9d2a2c2d5bda7";
 const basemultisig = "0x586CF50c2874f3e3997660c0FD0996B090FB9764";
@@ -12,7 +12,7 @@ const arbmultisig2 = "0x23dEDab98D7828AFBD2B7Ab8C71089f2C517774a";
 const polmultisig = "0x5D18b089e838DFFbb417A87874435175F3A9B000";
 const avaxmultisig = "0x1A927B237a57421C414EB511a33C4B82C2718677";
 const pcmultisig = "0x4b6c63e6a94ef26e2df60b89372db2d8e211f1b7"
-const treasurymultisig = "0x943dbdc995add25a1728a482322f9b3c575b16fb"
+const bugbountymultisig = "0x943dbdc995add25a1728a482322f9b3c575b16fb"
 const fedchair = "0x8f97cca30dbe80e7a8b462f1dd1a51c32accdfc8"
 
 module.exports = treasuryExports({
@@ -35,14 +35,15 @@ module.exports = treasuryExports({
       ADDRESSES.ethereum.SAFE,
       "0x22915f309EC0182c85cD8331C23bD187fd761360", // DOLA USDC Stable Pool Aura Deposit Vault
       "0x7f50786A0b15723D741727882ee99a0BF34e3466", // Stake DAO sdCRV Gauge
+      "0xf24d8651578a55b0c119b9910759a351a3458895", // sdBAL
       "0x445494F823f3483ee62d854eBc9f58d5B9972A25", // 50DOLA-50DBR
       "0xb204BF10bc3a5435017D3db247f56dA601dFe08A", // 50DOLA-50WETH
       "0x7e05540A61b531793742fde0514e6c136b5fbAfE", // xFODL
       "0xAD038Eb671c44b853887A7E32528FaB35dC5D710", // DBR
       "0x0a6B1d9F920019BAbc4De3F10c94ECB822106104",
       "0x73E02EAAb68a41Ea63bdae9Dbd4b7678827B2352",
     ],
-    owners: [anchorTreasury, multisig, pcmultisig, treasurymultisig, fedchair],
+    owners: [anchorTreasury, treasurymultisig, pcmultisig, bugbountymultisig, fedchair],
     ownTokens: [
       inv,
       "0x73E02EAAb68a41Ea63bdae9Dbd4b7678827B2352", // Uniswap INV/ETH LP
@@ -60,9 +61,12 @@ module.exports = treasuryExports({
       nullAddress,
       ADDRESSES.optimism.USDC,
       ADDRESSES.optimism.USDC_CIRCLE,
-      "0x8aE125E8653821E851F12A49F7765db9a9ce7384", // DOLA
-      "0xFAf8FD17D9840595845582fCB047DF13f006787d", // veVELO
-    ],    
+      "0x8aE125E8653821E851F12A49F7765db9a9ce7384", // DOLA      
+      "0x9560e827af36c94d2ac33a39bce1fe78631088db", // VELO      
+    ],
+    solidlyVeNfts: [
+      { baseToken: "0x9560e827af36c94d2ac33a39bce1fe78631088db", veNft: "0xFAf8FD17D9840595845582fCB047DF13f006787d" },// veVelo
+    ],
     owners: [opmultisig],
     ownTokens: [],
   },
@@ -71,21 +75,25 @@ module.exports = treasuryExports({
       nullAddress,
       ADDRESSES.base.USDC,
       ADDRESSES.base.USDbC,
-      "0x4621b7A9c75199271F773Ebd9A499dbd165c3191", // DOLA
-      "0xeBf418Fe2512e7E6bd9b87a8F0f294aCDC67e6B4", // veAERO
+      "0x4621b7A9c75199271F773Ebd9A499dbd165c3191", // DOLA      
       "0x940181a94A35A4569E4529A3CDfB74e38FD98631", // AERO
-    ],    
+    ],
+    solidlyVeNfts: [
+      { baseToken: "0x940181a94A35A4569E4529A3CDfB74e38FD98631", veNft: "0xeBf418Fe2512e7E6bd9b87a8F0f294aCDC67e6B4" },// veVelo
+    ],
     owners: [basemultisig],
     ownTokens: [],
   },
   bsc: {
     tokens: [
       nullAddress,
       ADDRESSES.bsc.WBNB,
-      "0x2F29Bc0FFAF9bff337b31CBe6CB5Fb3bf12e5840", // DOLA
-      "0xfBBF371C9B0B994EebFcC977CEf603F7f31c070D", // veTHE
+      "0x2F29Bc0FFAF9bff337b31CBe6CB5Fb3bf12e5840", // DOLA      
       "0xF4C8E32EaDEC4BFe97E0F595AdD0f4450a863a11", // THENA
-    ],    
+    ],
+    solidlyVeNfts: [
+      { isAltAbi: true, baseToken: "0xF4C8E32EaDEC4BFe97E0F595AdD0f4450a863a11", veNft: "0xfBBF371C9B0B994EebFcC977CEf603F7f31c070D" },// veTHENA
+    ],
     owners: [bnbmultisig],
     ownTokens: [],
   },
@@ -94,9 +102,11 @@ module.exports = treasuryExports({
       nullAddress,
       ADDRESSES.avax.USDC,
       '0x221743dc9E954bE4f86844649Bf19B43D6F8366d', // DOLA
-      '0xeeee99b35Eb6aF5E7d76dd846DbE4bcc0c60cA1d', // SNEK
-      '0xeeee3Bf0E550505C0C17a8432065F2f6b9D06350', // veSNEK
-    ],    
+      '0xeeee99b35Eb6aF5E7d76dd846DbE4bcc0c60cA1d', // SNEK      
+    ],
+    solidlyVeNfts: [
+      { isAltAbi: true, baseToken: "0xeeee99b35Eb6aF5E7d76dd846DbE4bcc0c60cA1d", veNft: "0xeeee3Bf0E550505C0C17a8432065F2f6b9D06350" },// veSNEK   
+    ],
     owners: [avaxmultisig],
     ownTokens: [],
   },
@@ -106,9 +116,14 @@ module.exports = treasuryExports({
       ADDRESSES.arbitrum.DAI,
       ADDRESSES.arbitrum.ARB,
       ADDRESSES.arbitrum.WETH,
-      "0xAAA6C1E32C55A7Bfa8066A6FAE9b42650F262418", // RAM
-      "0xAAA343032aA79eE9a6897Dab03bef967c3289a06", // veRAM
+      "0xAAA6C1E32C55A7Bfa8066A6FAE9b42650F262418", // RAM      
     ],    
+    solidlyVeNfts: [
+      { isAltAbi: true, baseToken: "0xAAA6C1E32C55A7Bfa8066A6FAE9b42650F262418", veNft: "0xAAA343032aA79eE9a6897Dab03bef967c3289a06" },// veRAM
+      { isAltAbi: true, baseToken: "0x5DB7b150c5F38c5F5db11dCBDB885028fcC51D68", veNft: "0x450330Df68E1ed6e0683373D684064bDa9115fEe" },// veSTR
+      { isAltAbi: true, baseToken: "0x463913D3a3D3D291667D53B8325c598Eb88D3B0e", veNft: "0x29d3622c78615A1E7459e4bE434d816b7de293e4" },// veSLIZ
+      { hasTokensOfOwnerAbi: true, baseToken: "0x15b2fb8f08E4Ac1Ce019EADAe02eE92AeDF06851", veNft: "0x9A01857f33aa382b1d5bb96C3180347862432B0d" },// veCHRONOS
+    ],
     owners: [arbmultisig2, arbmultisig],
     ownTokens: [],
   },
@@ -117,7 +132,7 @@ module.exports = treasuryExports({
       nullAddress,
       ADDRESSES.polygon.USDC,
       '0xbC2b48BC930Ddc4E5cFb2e87a45c379Aab3aac5C', // DOLA
-    ],
+    ],    
     owners: [polmultisig],
   },
 });