@stake-dao/reader 0.1.4 → 0.2.1

package/src/strategies/balancer/fetch.ts

@@ -0,0 +1,266 @@
+import { chunk } from 'lodash-es'
+import { decodeAbiParameters, encodeAbiParameters, formatUnits, parseAbiParameters, parseUnits } from 'viem'
+
+import {
+  BALANCER_FEE_SHARE_FOR_LP,
+  ETH_ONE_DAY_BLOCK,
+  ONE_WEEK,
+  ONE_YEAR,
+  STRAT_FEES,
+  balancerStrats,
+  contracts,
+  tokenWithId,
+} from '@stake-dao/constants'
+import { batchBalancerStrats } from '../../bytecodes/index.js'
+import { OneEther, Zero, concatBytecode, getBoost, getPricesFromLlama, getSdtApr } from '../../index.js'
+import { equalTlc, graphql } from '../../utils.js'
+import { FACTORY_EXPLORER_EVENTS } from '../curve/endpoints.js'
+import type { BalancerGlobalData, RewardsData, Strategy, StrategyData, ValidChainId, ValidExplorer } from '../types.js'
+import decodeEtherscanFactoryEvent from '../utils/decodeEtherscanFactoryEvent.js'
+import { getAprBreakdown } from '../utils/getAprBreakdown.js'
+import { buildBalancerStrategies } from './build.js'
+import { BALANCER_POOLS_DATA_QUERY, BALANCER_SUBGRAPH_URL } from './endpoints.js'
+
+interface TFetchBalancer {
+  provider: any
+  explorer: ValidExplorer
+  explorerApiKey: string
+  chainId: ValidChainId
+  sdtEmissionData: any
+}
+
+export const fetchBalancer = async ({
+  provider,
+  explorer,
+  explorerApiKey,
+  chainId,
+  sdtEmissionData,
+}: TFetchBalancer): Promise<StrategyData> => {
+  const currentBlockNumber = Number(await provider.getBlockNumber())
+  const lastBlockNumber = balancerStrats.meta.lastSyncBlock[chainId]! + 1
+
+  const httpCalls = [
+    // Etherscan Events
+    (
+      await fetch(
+        FACTORY_EXPLORER_EVENTS(explorerApiKey, explorer, contracts.balancerVaultFactory![1]!, lastBlockNumber),
+      )
+    ).json(),
+  ]
+
+  const httpResponses = (await Promise.allSettled(httpCalls)).map((result) =>
+    result.status === 'fulfilled' ? result.value : [],
+  )
+
+  const newVaultsAndLp = decodeEtherscanFactoryEvent(httpResponses[0])
+  const vaultsAndLp = balancerStrats.strats[chainId] || []
+
+  const strats: any[] = await buildBalancerStrategies(provider, vaultsAndLp.concat(newVaultsAndLp), chainId)
+
+  const poolIds = strats.map((s) => s.key)
+  const tokensToFetch: any = [tokenWithId('bal'), tokenWithId('sdt')]
+  for (const s of strats) {
+    tokensToFetch.push(s.lpToken)
+    tokensToFetch.push(...s.coins)
+  }
+
+  const moreHttpCalls = [
+    // Balancer Subgraph
+    graphql(BALANCER_SUBGRAPH_URL, BALANCER_POOLS_DATA_QUERY, { id: poolIds, block: currentBlockNumber }),
+    graphql(BALANCER_SUBGRAPH_URL, BALANCER_POOLS_DATA_QUERY, {
+      id: poolIds,
+      block: currentBlockNumber - ETH_ONE_DAY_BLOCK,
+    }),
+    // Prices
+    getPricesFromLlama(tokensToFetch), // TODO
+  ]
+
+  const moreHttpResponses = (await Promise.allSettled(moreHttpCalls)).map((result) =>
+    result.status === 'fulfilled' ? result.value : [result.reason],
+  )
+
+  const subgraphPoolsData = moreHttpResponses[0]?.pools
+  const subgraphPoolsDataSnapshot = moreHttpResponses[1]?.pools
+  const prices = moreHttpResponses[2]
+
+  const stratsDataCalls = strats.map((s) => ({
+    vault: s.vault,
+    token: s.lpToken.address,
+  }))
+
+  const inputArgsChunks = chunk(stratsDataCalls, 20)
+  const decodedPromise = await Promise.allSettled(
+    inputArgsChunks.map(async (inputArgs) => {
+      const inputData = encodeAbiParameters(parseAbiParameters(batchBalancerStrats.inputType[chainId]!) as any, [
+        contracts.balancerTokenAdmin![chainId],
+        contracts.balancerGaugeController![chainId],
+        contracts.sdGaugeController![chainId],
+        contracts.balancerLocker![chainId],
+        inputArgs,
+      ])
+      const contractCreationCode = concatBytecode(batchBalancerStrats.bytecode[chainId]!, inputData)
+      const returnedData = await provider.call({
+        data: contractCreationCode,
+      })
+      return decodeAbiParameters(
+        parseAbiParameters(batchBalancerStrats.outputTypeHr[chainId]!) as any,
+        returnedData.data,
+      )
+    }),
+  )
+
+  const global: BalancerGlobalData = {
+    totalGaugeWeights: '0',
+    inflationRate: '0',
+    balPerWeek: '0',
+    fees: {
+      veSdt: 5,
+      perf: 2,
+      accumulator: 8,
+      claimer: 1,
+    },
+  }
+
+  let stratsData: Strategy[] = []
+
+  decodedPromise.forEach((d, index) => {
+    if (d.status === 'fulfilled') {
+      if (index === 0) {
+        global.totalGaugeWeights = formatUnits(d.value[0].totalGaugeWeights, 0)
+        global.inflationRate = formatUnits(d.value[0].inflationRate, 0)
+        global.balPerWeek = formatUnits(d.value[0].inflationRate * BigInt(ONE_WEEK), 0)
+      }
+
+      const parsedData = d.value[0].balancerStratsData.map((v) => {
+        let strat = strats.find((s) => equalTlc(s.vault, v.vault))
+
+        const bal = tokenWithId('bal', chainId)
+        const poolData = subgraphPoolsData?.find((data) => data.id === strat.key)
+        const snapshotData = subgraphPoolsDataSnapshot.find((data) => data.id === strat.key)
+        const balPriceInUsd = prices.find((p) => p.address.toLowerCase() === tokenWithId('bal')!.address.toLowerCase())
+        const lpPriceInUsd = prices.find((p) => p.address.toLowerCase() === strat.lpToken.address.toLowerCase())
+
+        if (lpPriceInUsd && lpPriceInUsd.usdPrice === 0 && poolData) {
+          lpPriceInUsd.usdPrice = Number(poolData.totalLiquidity) / Number(poolData.totalShares)
+        }
+
+        let swapFeeApr = 0
+        if (poolData) {
+          const lastDaySwapFeesInUsd = poolData.totalSwapFee - snapshotData.totalSwapFee
+          const dailySwapFeeApr =
+            Number(poolData.totalLiquidity) > 0
+              ? (lastDaySwapFeesInUsd * BALANCER_FEE_SHARE_FOR_LP) / Number(poolData.totalLiquidity)
+              : 0
+          swapFeeApr = dailySwapFeeApr * 365 * 100
+        }
+
+        const balRewards = BigInt(global.balPerWeek) * v.poolGaugeRelativeWeight
+
+        const bptPriceBn = lpPriceInUsd ? parseUnits(lpPriceInUsd.usdPrice.toString(), 18) : Zero
+        const balPriceBn = parseUnits((balPriceInUsd?.usdPrice || 0).toString(), 18)
+
+        const workingBalance = BigInt(4) * parseUnits('10', 35) // Should be 0.4
+        const shareForOneBpt = workingBalance / v.workingSupplyStaked
+
+        const weeklyReward = shareForOneBpt * balRewards
+        const yearlyReward = weeklyReward * BigInt(52) * balPriceBn
+        const rawBalApr = bptPriceBn > Zero ? yearlyReward / bptPriceBn / parseUnits('10', 18) : Zero
+
+        const balApr = formatUnits(rawBalApr, 36)
+        const minApr = Number(balApr) * (100 - STRAT_FEES)
+        const maxApr = Number(balApr) * 2.5 * (100 - STRAT_FEES)
+
+        strat = { ...strat, tradingApy: swapFeeApr, minApr, maxApr }
+
+        const tvl =
+          v.totalSupply && lpPriceInUsd?.usdPrice ? Number(formatUnits(v.totalSupply, 18)) * lpPriceInUsd.usdPrice : 0
+
+        const sdGauge = {
+          address: v.gauge,
+          totalSupply: formatUnits(v.sdGaugeTotalSupply, 0),
+          relativeWeight: formatUnits(v.gaugeRelativeWeight, 0),
+          weight: formatUnits(v.gaugeWeight, 0),
+          futureWeight:
+            BigInt(global.totalGaugeWeights) > 0
+              ? formatUnits(((v.gaugeWeight as bigint) * OneEther * OneEther) / BigInt(global.totalGaugeWeights), 0)
+              : '0',
+          workingSupply: formatUnits(v.sdWorkingSupply, 0),
+        }
+
+        const boost = getBoost('balancer', v.strategyHoldings, v.workingBalance)
+
+        const rewardsData: RewardsData[] = v.sdRewardsData.map((r: any, rewardIndex: number) => {
+          const rewardToken = strat.rewards[rewardIndex]
+          const rewardPrice = prices.find((p: any) => equalTlc(p.symbol, rewardToken.symbol))
+
+          const periodFinish = Number(formatUnits(r.period_finish, 0))
+          const streaming = periodFinish > Math.floor(Date.now() / 1000)
+
+          const rewardApr =
+            streaming && rewardPrice && tvl > 0
+              ? (Number(formatUnits(r.rate * BigInt(ONE_YEAR), 18)) * rewardPrice.usdPrice) /
+                tvl /
+                (equalTlc(rewardToken.symbol, 'SDT') ? 2.5 : 1)
+              : 0
+
+          return {
+            token: rewardToken,
+            price: rewardPrice ? rewardPrice.usdPrice : 0,
+            apr: rewardApr * 100,
+            streaming,
+            periodFinish,
+            rate: formatUnits(r.rate, 0),
+            lastUpdate: formatUnits(r.last_update, 0),
+            claimablePendingRewards: equalTlc(r.token, bal?.address!) ? formatUnits(v.claimablePendingRewards, 0) : '0', // TODO
+          }
+        })
+
+        const sdtApr = getSdtApr(rewardsData, sdtEmissionData, sdGauge, lpPriceInUsd.usdPrice, undefined)
+        const apr = getAprBreakdown(strat, rewardsData, boost, sdtApr)
+
+        const coins = strat.underlyingCoins?.length > 0 ? strat.underlyingCoins : strat.coins
+
+        return {
+          key: strat.key,
+          name: coins.reduce((res: string, current) => `${res}/${current.symbol}`, '').slice(1),
+          protocol: strat.protocol,
+          chainId: strat.chainId,
+          vault: strat.vault,
+          lpToken: strat.lpToken,
+          gaugeAddress: strat.gaugeAddress,
+          coins: strat.coins,
+          sdGauge,
+          lpPriceInUsd: lpPriceInUsd ? lpPriceInUsd.usdPrice : 0,
+          tvl,
+          apr: {
+            boost,
+            ...apr,
+          },
+          sdtApr,
+          rewards: rewardsData,
+          // Base APR data
+          tradingApy: strat.tradingApy,
+          minApr: strat.minApr,
+          maxApr: strat.maxApr,
+          // Raw data
+          vaultHoldings: formatUnits(v.vaultHoldings, 0),
+          totalSupply: formatUnits(v.totalSupply, 0),
+          strategyHoldings: formatUnits(v.strategyHoldings, 0),
+          workingBalance: formatUnits(v.workingBalance, 0),
+          // Gas optimised
+          vaultFees: {
+            keeper: Number(v.keeperFee) / 100,
+            accumulated: formatUnits(v.accumulatedFees, 0),
+          },
+        }
+      })
+      stratsData = stratsData.concat(parsedData)
+    }
+  })
+
+  return {
+    deployed: stratsData,
+    notDeployed: [],
+    fetched: true,
+  }
+}

package/src/strategies/curve/build.ts

@@ -3,9 +3,10 @@ import { decodeAbiParameters, encodeAbiParameters, parseAbi, parseAbiParameters
 
 import { contract, tokens } from '@stake-dao/constants'
 import type { FetchedToken, Token } from '@stake-dao/constants'
-import { batchSdtGaugeRewards, batchTokenData } from '../../batches/index.js'
+import { batchSdtGaugeRewards, batchTokenData } from '../../bytecodes/index.js'
 import { equalTlc, getTokenInfo } from '../../utils.js'
 import type { BuiltStrat } from '../types.js'
+import { concatBytecode } from '../utils/index.js'
 
 interface VaultAndLp {
   vault: string
@@ -86,7 +87,7 @@ export const buildCurveStrategies = async (
       const inputData = encodeAbiParameters(parseAbiParameters(batchTokenData.inputType[chainId] || []) as any, [
         inputArgs,
       ])
-      const contractCreationCode = batchTokenData.bytecode[chainId]?.concat(inputData.slice(2))
+      const contractCreationCode = concatBytecode(batchTokenData.bytecode[chainId]!, inputData)
       const returnedData = await provider.call({
         data: contractCreationCode,
       })
@@ -109,7 +110,7 @@ export const buildCurveStrategies = async (
       const inputData = encodeAbiParameters(parseAbiParameters(batchSdtGaugeRewards.inputType[chainId] || []) as any, [
         inputArgs,
       ])
-      const contractCreationCode = batchSdtGaugeRewards.bytecode[chainId]?.concat(inputData.slice(2))
+      const contractCreationCode = concatBytecode(batchSdtGaugeRewards.bytecode[chainId]!, inputData)
       const returnedData = await provider.call({
         data: contractCreationCode,
       })

package/src/strategies/curve/fetch/curveApiData/bytecode.ts

@@ -24,7 +24,6 @@ export const gaugesBytecode = {
   42161:
     '0x608060405234801561000f575f80fd5b5060405161106a38038061106a833981810160405281019061003191906109be565b5f815190505f8167ffffffffffffffff81111561005157610050610828565b5b60405190808252806020026020018201604052801561008a57816020015b61007761072d565b81526020019060019003908161006f5790505b5090505f5b828110156106ed575f8482815181106100ab576100aa610a05565b5b602002602001015190506100bd61072d565b81815f019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506101038261071c60201b60201c565b6106bf578173ffffffffffffffffffffffffffffffffffffffff166382c630666040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561016f57506040513d601f19601f8201168201806040525081019061016c9190610a32565b60015b156101ae5780826020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050505b8173ffffffffffffffffffffffffffffffffffffffff16639c868ac06040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561021657506040513d601f19601f820116820180604052508101906102139190610a92565b60015b156106be57808260400190151590811515815250505f1515811515036106bc578273ffffffffffffffffffffffffffffffffffffffff166317e280896040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561029e57506040513d601f19601f8201168201806040525081019061029b9190610af0565b60015b156102af5780836060018181525050505b8273ffffffffffffffffffffffffffffffffffffffff1663963c94b96040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561031757506040513d601f19601f820116820180604052508101906103149190610af0565b60015b156106bb578067ffffffffffffffff81111561033657610335610828565b5b60405190808252806020026020018201604052801561036f57816020015b61035c610786565b8152602001906001900390816103545790505b5083608001819052505f5b818110156106b8575f8573ffffffffffffffffffffffffffffffffffffffff166354c49fe9836040518263ffffffff1660e01b81526004016103bc9190610b2a565b602060405180830381865afa1580156103d7573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103fb9190610a32565b9050610405610786565b5f8773ffffffffffffffffffffffffffffffffffffffff166348e9c65e846040518263ffffffff1660e01b815260040161043f9190610b52565b60a060405180830381865afa15801561045a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061047e9190610bf8565b90505f83905083835f01515f019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508073ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b81526004015f60405180830381865afa158015610506573d5f803e3d5ffd5b505050506040513d5f823e3d601f19601f8201168201806040525081019061052e9190610cd3565b835f0151602001819052508073ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b81526004015f60405180830381865afa158015610581573d5f803e3d5ffd5b505050506040513d5f823e3d601f19601f820116820180604052508101906105a99190610cd3565b835f0151604001819052508073ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156105fd573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106219190610af0565b835f01516060018181525050815f0151836020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505081602001518360400181815250508160400151836060018181525050828860800151868151811061069c5761069b610a05565b5b602002602001018190525050505050808060010191505061037a565b50505b5b505b5b808484815181106106d3576106d2610a05565b5b60200260200101819052505050808060010191505061008f565b505f816040516020016107009190611049565b6040516020818303038152906040529050602081018059038082f35b5f80823b90505f8114915050919050565b6040518060a001604052805f73ffffffffffffffffffffffffffffffffffffffff1681526020015f73ffffffffffffffffffffffffffffffffffffffff1681526020015f151581526020015f8152602001606081525090565b60405180608001604052806107996107c7565b81526020015f73ffffffffffffffffffffffffffffffffffffffff1681526020015f81526020015f81525090565b60405180608001604052805f73ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001606081526020015f81525090565b5f604051905090565b5f80fd5b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b61085e82610818565b810181811067ffffffffffffffff8211171561087d5761087c610828565b5b80604052505050565b5f61088f610803565b905061089b8282610855565b919050565b5f67ffffffffffffffff8211156108ba576108b9610828565b5b602082029050602081019050919050565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6108f8826108cf565b9050919050565b610908816108ee565b8114610912575f80fd5b50565b5f81519050610923816108ff565b92915050565b5f61093b610936846108a0565b610886565b9050808382526020820190506020840283018581111561095e5761095d6108cb565b5b835b8181101561098757806109738882610915565b845260208401935050602081019050610960565b5050509392505050565b5f82601f8301126109a5576109a4610814565b5b81516109b5848260208601610929565b91505092915050565b5f602082840312156109d3576109d261080c565b5b5f82015167ffffffffffffffff8111156109f0576109ef610810565b5b6109fc84828501610991565b91505092915050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b5f60208284031215610a4757610a4661080c565b5b5f610a5484828501610915565b91505092915050565b5f8115159050919050565b610a7181610a5d565b8114610a7b575f80fd5b50565b5f81519050610a8c81610a68565b92915050565b5f60208284031215610aa757610aa661080c565b5b5f610ab484828501610a7e565b91505092915050565b5f819050919050565b610acf81610abd565b8114610ad9575f80fd5b50565b5f81519050610aea81610ac6565b92915050565b5f60208284031215610b0557610b0461080c565b5b5f610b1284828501610adc565b91505092915050565b610b2481610abd565b82525050565b5f602082019050610b3d5f830184610b1b565b92915050565b610b4c816108ee565b82525050565b5f602082019050610b655f830184610b43565b92915050565b5f80fd5b5f60a08284031215610b8457610b83610b6b565b5b610b8e60a0610886565b90505f610b9d84828501610915565b5f830152506020610bb084828501610adc565b6020830152506040610bc484828501610adc565b6040830152506060610bd884828501610adc565b6060830152506080610bec84828501610adc565b60808301525092915050565b5f60a08284031215610c0d57610c0c61080c565b5b5f610c1a84828501610b6f565b91505092915050565b5f80fd5b5f67ffffffffffffffff821115610c4157610c40610828565b5b610c4a82610818565b9050602081019050919050565b8281835e5f83830152505050565b5f610c77610c7284610c27565b610886565b905082815260208101848484011115610c9357610c92610c23565b5b610c9e848285610c57565b509392505050565b5f82601f830112610cba57610cb9610814565b5b8151610cca848260208601610c65565b91505092915050565b5f60208284031215610ce857610ce761080c565b5b5f82015167ffffffffffffffff811115610d0557610d04610810565b5b610d1184828501610ca6565b91505092915050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b610d4c816108ee565b82525050565b610d5b81610a5d565b82525050565b610d6a81610abd565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b5f81519050919050565b5f82825260208201905092915050565b5f610dbd82610d99565b610dc78185610da3565b9350610dd7818560208601610c57565b610de081610818565b840191505092915050565b5f608083015f830151610e005f860182610d43565b5060208301518482036020860152610e188282610db3565b91505060408301518482036040860152610e328282610db3565b9150506060830151610e476060860182610d61565b508091505092915050565b5f608083015f8301518482035f860152610e6c8282610deb565b9150506020830151610e816020860182610d43565b506040830151610e946040860182610d61565b506060830151610ea76060860182610d61565b508091505092915050565b5f610ebd8383610e52565b905092915050565b5f602082019050919050565b5f610edb82610d70565b610ee58185610d7a565b935083602082028501610ef785610d8a565b805f5b85811015610f325784840389528151610f138582610eb2565b9450610f1e83610ec5565b925060208a01995050600181019050610efa565b50829750879550505050505092915050565b5f60a083015f830151610f595f860182610d43565b506020830151610f6c6020860182610d43565b506040830151610f7f6040860182610d52565b506060830151610f926060860182610d61565b5060808301518482036080860152610faa8282610ed1565b9150508091505092915050565b5f610fc28383610f44565b905092915050565b5f602082019050919050565b5f610fe082610d1a565b610fea8185610d24565b935083602082028501610ffc85610d34565b805f5b8581101561103757848403895281516110188582610fb7565b945061102383610fca565b925060208a01995050600181019050610fff565b50829750879550505050505092915050565b5f6020820190508181035f8301526110618184610fd6565b90509291505056fe',
 }
-;('0x608060405234801561000f575f80fd5b506040516111ef3803806111ef83398181016040528101906100319190610abf565b5f815190505f8167ffffffffffffffff81111561005157610050610929565b5b60405190808252806020026020018201604052801561008a57816020015b610077610828565b81526020019060019003908161006f5790505b5090505f5b82811015610682575f8482815181106100ab576100aa610b06565b5b602002602001015190506100bd610828565b81815f019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508173ffffffffffffffffffffffffffffffffffffffff166382c630666040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561015c57506040513d601f19601f820116820180604052508101906101599190610b33565b60015b1561019b5780826020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050505b8173ffffffffffffffffffffffffffffffffffffffff16639c868ac06040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561020357506040513d601f19601f820116820180604052508101906102009190610b93565b60015b1561065457808260400190151590811515815250505f15158115150361065257610232836106b160201b60201c565b8360600184608001828152508281525050508273ffffffffffffffffffffffffffffffffffffffff1663963c94b96040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156102ac57506040513d601f19601f820116820180604052508101906102a99190610bf1565b60015b15610651578067ffffffffffffffff8111156102cb576102ca610929565b5b60405190808252806020026020018201604052801561030457816020015b6102f1610887565b8152602001906001900390816102e95790505b508360a001819052505f5b8181101561064e575f8573ffffffffffffffffffffffffffffffffffffffff166354c49fe9836040518263ffffffff1660e01b81526004016103519190610c2b565b602060405180830381865afa15801561036c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103909190610b33565b905061039a610887565b5f8773ffffffffffffffffffffffffffffffffffffffff166348e9c65e846040518263ffffffff1660e01b81526004016103d49190610c53565b60c060405180830381865afa1580156103ef573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104139190610d0d565b90505f83905083835f01515f019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508073ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b81526004015f60405180830381865afa15801561049b573d5f803e3d5ffd5b505050506040513d5f823e3d601f19601f820116820180604052508101906104c39190610de8565b835f0151602001819052508073ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b81526004015f60405180830381865afa158015610516573d5f803e3d5ffd5b505050506040513d5f823e3d601f19601f8201168201806040525081019061053e9190610de8565b835f0151604001819052508073ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610592573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105b69190610bf1565b835f015160600181815250508160200151836020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505081604001518360400181815250508160600151836060018181525050828860a00151868151811061063257610631610b06565b5b602002602001018190525050505050808060010191505061030f565b50505b5b505b8084848151811061066857610667610b06565b5b60200260200101819052505050808060010191505061008f565b505f816040516020016106959190611171565b6040516020818303038152906040529050602081018059038082f35b5f808273ffffffffffffffffffffffffffffffffffffffff166317e280896040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561071b57506040513d601f19601f820116820180604052508101906107189190610bf1565b60015b1561072557809150505b8273ffffffffffffffffffffffffffffffffffffffff1663180692d06040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561078d57506040513d601f19601f8201168201806040525081019061078a9190610bf1565b60015b61081e578273ffffffffffffffffffffffffffffffffffffffff1663fadd59ab62093a80426107bc91906111be565b6040518263ffffffff1660e01b81526004016107d89190610c2b565b602060405180830381865afa1580156107f3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108179190610bf1565b9150610823565b809250505b915091565b6040518060c001604052805f73ffffffffffffffffffffffffffffffffffffffff1681526020015f73ffffffffffffffffffffffffffffffffffffffff1681526020015f151581526020015f81526020015f8152602001606081525090565b604051806080016040528061089a6108c8565b81526020015f73ffffffffffffffffffffffffffffffffffffffff1681526020015f81526020015f81525090565b60405180608001604052805f73ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001606081526020015f81525090565b5f604051905090565b5f80fd5b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b61095f82610919565b810181811067ffffffffffffffff8211171561097e5761097d610929565b5b80604052505050565b5f610990610904565b905061099c8282610956565b919050565b5f67ffffffffffffffff8211156109bb576109ba610929565b5b602082029050602081019050919050565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6109f9826109d0565b9050919050565b610a09816109ef565b8114610a13575f80fd5b50565b5f81519050610a2481610a00565b92915050565b5f610a3c610a37846109a1565b610987565b90508083825260208201905060208402830185811115610a5f57610a5e6109cc565b5b835b81811015610a885780610a748882610a16565b845260208401935050602081019050610a61565b5050509392505050565b5f82601f830112610aa657610aa5610915565b5b8151610ab6848260208601610a2a565b91505092915050565b5f60208284031215610ad457610ad361090d565b5b5f82015167ffffffffffffffff811115610af157610af0610911565b5b610afd84828501610a92565b91505092915050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b5f60208284031215610b4857610b4761090d565b5b5f610b5584828501610a16565b91505092915050565b5f8115159050919050565b610b7281610b5e565b8114610b7c575f80fd5b50565b5f81519050610b8d81610b69565b92915050565b5f60208284031215610ba857610ba761090d565b5b5f610bb584828501610b7f565b91505092915050565b5f819050919050565b610bd081610bbe565b8114610bda575f80fd5b50565b5f81519050610beb81610bc7565b92915050565b5f60208284031215610c0657610c0561090d565b5b5f610c1384828501610bdd565b91505092915050565b610c2581610bbe565b82525050565b5f602082019050610c3e5f830184610c1c565b92915050565b610c4d816109ef565b82525050565b5f602082019050610c665f830184610c44565b92915050565b5f80fd5b5f60c08284031215610c8557610c84610c6c565b5b610c8f60c0610987565b90505f610c9e84828501610a16565b5f830152506020610cb184828501610a16565b6020830152506040610cc584828501610bdd565b6040830152506060610cd984828501610bdd565b6060830152506080610ced84828501610bdd565b60808301525060a0610d0184828501610bdd565b60a08301525092915050565b5f60c08284031215610d2257610d2161090d565b5b5f610d2f84828501610c70565b91505092915050565b5f80fd5b5f67ffffffffffffffff821115610d5657610d55610929565b5b610d5f82610919565b9050602081019050919050565b8281835e5f83830152505050565b5f610d8c610d8784610d3c565b610987565b905082815260208101848484011115610da857610da7610d38565b5b610db3848285610d6c565b509392505050565b5f82601f830112610dcf57610dce610915565b5b8151610ddf848260208601610d7a565b91505092915050565b5f60208284031215610dfd57610dfc61090d565b5b5f82015167ffffffffffffffff811115610e1a57610e19610911565b5b610e2684828501610dbb565b91505092915050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b610e61816109ef565b82525050565b610e7081610b5e565b82525050565b610e7f81610bbe565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b5f81519050919050565b5f82825260208201905092915050565b5f610ed282610eae565b610edc8185610eb8565b9350610eec818560208601610d6c565b610ef581610919565b840191505092915050565b5f608083015f830151610f155f860182610e58565b5060208301518482036020860152610f2d8282610ec8565b91505060408301518482036040860152610f478282610ec8565b9150506060830151610f5c6060860182610e76565b508091505092915050565b5f608083015f8301518482035f860152610f818282610f00565b9150506020830151610f966020860182610e58565b506040830151610fa96040860182610e76565b506060830151610fbc6060860182610e76565b508091505092915050565b5f610fd28383610f67565b905092915050565b5f602082019050919050565b5f610ff082610e85565b610ffa8185610e8f565b93508360208202850161100c85610e9f565b805f5b8581101561104757848403895281516110288582610fc7565b945061103383610fda565b925060208a0199505060018101905061100f565b50829750879550505050505092915050565b5f60c083015f83015161106e5f860182610e58565b5060208301516110816020860182610e58565b5060408301516110946040860182610e67565b5060608301516110a76060860182610e76565b5060808301516110ba6080860182610e76565b5060a083015184820360a08601526110d28282610fe6565b9150508091505092915050565b5f6110ea8383611059565b905092915050565b5f602082019050919050565b5f61110882610e2f565b6111128185610e39565b93508360208202850161112485610e49565b805f5b8581101561115f578484038952815161114085826110df565b945061114b836110f2565b925060208a01995050600181019050611127565b50829750879550505050505092915050565b5f6020820190508181035f83015261118981846110fe565b905092915050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601260045260245ffd5b5f6111c882610bbe565b91506111d383610bbe565b9250826111e3576111e2611191565b5b82820490509291505056fe')
 
 export const gaugesWeightBytecode =
   '0x608060405234801561000f575f80fd5b506040516108573803806108578339818101604052810190610031919061047b565b5f732f50d538606fa9edd2b11e2446beb18c9d5846bb90505f82146100565781610058565b835b91505f838361006791906104f8565b67ffffffffffffffff8111156100805761007f61052b565b5b6040519080825280602002602001820160405280156100b957816020015b6100a661040a565b81526020019060019003908161009e5790505b5090505f8490505b838110156102e8575f8373ffffffffffffffffffffffffffffffffffffffff1663b0539187836040518263ffffffff1660e01b81526004016101039190610567565b602060405180830381865afa15801561011e573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061014291906105da565b905061014c61040a565b81815f019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506101928261031760201b60201c565b8160200181815250508473ffffffffffffffffffffffffffffffffffffffff166395cfcec3836040518263ffffffff1660e01b81526004016101d49190610614565b6020604051808303815f875af11580156101f0573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610214919061062d565b8160400181815250508473ffffffffffffffffffffffffffffffffffffffff16636472eee18362093a80426102499190610658565b6040518363ffffffff1660e01b815260040161026692919061068b565b6020604051808303815f875af1158015610282573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102a6919061062d565b816060018181525050808488856102bd91906104f8565b815181106102ce576102cd6106b2565b5b6020026020010181905250505080806001019150506100c1565b505f816040516020016102fb91906107f8565b6040516020818303038152906040529050602081018059038082f35b5f808290508073ffffffffffffffffffffffffffffffffffffffff166378de221b6040518163ffffffff1660e01b81526004016040805180830381865afa92505050801561038357506040513d601f19601f820116820180604052508101906103809190610818565b60015b6103fe578073ffffffffffffffffffffffffffffffffffffffff1663180692d06040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156103ef57506040513d601f19601f820116820180604052508101906103ec919061062d565b60015b156103f957809250505b610404565b81935050505b50919050565b60405180608001604052805f73ffffffffffffffffffffffffffffffffffffffff1681526020015f81526020015f81526020015f81525090565b5f80fd5b5f819050919050565b61045a81610448565b8114610464575f80fd5b50565b5f8151905061047581610451565b92915050565b5f805f6060848603121561049257610491610444565b5b5f61049f86828701610467565b93505060206104b086828701610467565b92505060406104c186828701610467565b9150509250925092565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f61050282610448565b915061050d83610448565b9250828203905081811115610525576105246104cb565b5b92915050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b61056181610448565b82525050565b5f60208201905061057a5f830184610558565b92915050565b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6105a982610580565b9050919050565b6105b98161059f565b81146105c3575f80fd5b50565b5f815190506105d4816105b0565b92915050565b5f602082840312156105ef576105ee610444565b5b5f6105fc848285016105c6565b91505092915050565b61060e8161059f565b82525050565b5f6020820190506106275f830184610605565b92915050565b5f6020828403121561064257610641610444565b5b5f61064f84828501610467565b91505092915050565b5f61066282610448565b915061066d83610448565b9250828201905080821115610685576106846104cb565b5b92915050565b5f60408201905061069e5f830185610605565b6106ab6020830184610558565b9392505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b6107118161059f565b82525050565b61072081610448565b82525050565b608082015f82015161073a5f850182610708565b50602082015161074d6020850182610717565b5060408201516107606040850182610717565b5060608201516107736060850182610717565b50505050565b5f6107848383610726565b60808301905092915050565b5f602082019050919050565b5f6107a6826106df565b6107b081856106e9565b93506107bb836106f9565b805f5b838110156107eb5781516107d28882610779565b97506107dd83610790565b9250506001810190506107be565b5085935050505092915050565b5f6020820190508181035f830152610810818461079c565b905092915050565b5f806040838503121561082e5761082d610444565b5b5f61083b85828601610467565b925050602061084c85828601610467565b915050925092905056fe'

package/src/strategies/curve/fetch/curveApiData/getCurveApiData.ts

@@ -5,6 +5,7 @@ import { mainnet } from 'viem/chains'
 import { LLAMA_API_URL } from '../../../../endpoints.js'
 import { getLlamaTokenPrefix, getPricesFromCurve } from '../../../../prices.js'
 import { batchJsonRpc, equalTlc } from '../../../../utils.js'
+import { concatBytecode } from '../../../utils/index.js'
 import { handlePromise } from '../../../utils/promise.js'
 import { getCurveDataGaugesOutputTypeAbi } from './abi.js'
 import { gaugesBytecode } from './bytecode.js'
@@ -14,7 +15,7 @@ import type { GaugeWeight } from './getGaugesWeights.js'
 import { getPoolsFromRegistries } from './getPoolsFromRegistries.ts.js'
 import { getRegistries } from './getRegistries.js'
 
-export const fetchCurveBase = async (rpc: string, chainId: number, gaugesWeights: GaugeWeight[]) => {
+export const getCurveApiData = async (rpc: string, chainId: number, gaugesWeights: GaugeWeight[]) => {
   const { lendingCallsStartIndex, poolCounts } = await getRegistries(rpc, chainId)
 
   const promises = await handlePromise(
@@ -52,7 +53,7 @@ export const fetchCurveBase = async (rpc: string, chainId: number, gaugesWeights
     const inputParams = [gauges]
 
     const inputData = encodeAbiParameters(parseAbiParameters(['address[] gauges']) as any, inputParams)
-    return gaugesBytecode[chainId].concat(inputData.slice(2))
+    return concatBytecode(gaugesBytecode[chainId], inputData)
   })
 
   const gauges = await batchJsonRpc({
@@ -60,7 +61,7 @@ export const fetchCurveBase = async (rpc: string, chainId: number, gaugesWeights
     calls: gaugesCalls,
     outputTypeAbi: getCurveDataGaugesOutputTypeAbi,
     parse: false,
-    callsKey: 'Fetch Curve Gauges',
+    callsKey: `strategies/curve/fetch/curveApiData/getCurveApiData.ts: gauges - chainId ${chainId} - rpc ${rpc}`,
   })
 
   const tokens = uniqBy(

package/src/strategies/curve/fetch/curveApiData/getGaugesFromRegistry.ts

@@ -2,6 +2,7 @@ import { contracts } from '@stake-dao/constants'
 import { range } from 'lodash-es'
 import { decodeAbiParameters, encodeAbiParameters, parseAbiParameters } from 'viem'
 import { batchJsonRpc, rpcCall } from '../../../../utils.js'
+import { concatBytecode } from '../../../utils/index.js'
 import { gaugesRegistryBytecode } from './bytecode.js'
 import { GAUGES_REGISTRY_CHUNK_SIZE } from './config.js'
 
@@ -9,7 +10,10 @@ export const getGaugesFromRegistry = async (chainId: number, rpc: string): Promi
   const nGaugesRequest = await rpcCall(rpc, [
     {
       to: contracts.curveGaugeRegistry![1]!,
-      data: `0x38f31214${encodeAbiParameters(parseAbiParameters(['uint256 chainId']) as any, [chainId]).slice(2)}`,
+      data: concatBytecode(
+        '0x38f31214',
+        encodeAbiParameters(parseAbiParameters(['uint256 chainId']) as any, [chainId]),
+      ),
     },
   ])
 
@@ -26,7 +30,7 @@ export const getGaugesFromRegistry = async (chainId: number, rpc: string): Promi
       parseAbiParameters(['uint256 chainId, uint256 skip, uint256 limit']) as any,
       inputParams,
     )
-    return gaugesRegistryBytecode.concat(inputData.slice(2))
+    return concatBytecode(gaugesRegistryBytecode, inputData)
   })
 
   const gaugesFromRegistry = await batchJsonRpc({
@@ -34,7 +38,7 @@ export const getGaugesFromRegistry = async (chainId: number, rpc: string): Promi
     calls: gaugesRegistryCalls,
     outputTypeAbi: [{ type: 'address[]', name: 'returnData' }],
     parse: false,
-    callsKey: 'Fetch Curve Gauges Weights',
+    callsKey: `strategies/curve/fetch/curveApiData/getGaugesFromRegistry.ts: gaugesFromRegistry - chainId ${chainId} - rpc ${rpc}`,
   })
 
   return gaugesFromRegistry

package/src/strategies/curve/fetch/curveApiData/getGaugesWeights.ts

@@ -2,6 +2,7 @@ import { contracts } from '@stake-dao/constants'
 import { range } from 'lodash-es'
 import { decodeAbiParameters, encodeAbiParameters, formatUnits, parseAbiParameters } from 'viem'
 import { batchJsonRpc, rpcCall } from '../../../../utils.js'
+import { concatBytecode } from '../../../utils/index.js'
 import { getCurveDataGaugesWeightsOutputTypeAbi } from './abi.js'
 import { gaugesWeightBytecode } from './bytecode.js'
 import { GAUGES_WEIGHTS_CHUNK_SIZE } from './config.js'
@@ -31,7 +32,7 @@ export const getGaugesWeights = async (rpc: string): Promise<GaugesWeightsData>
       parseAbiParameters(['uint256 maxLength, uint256 skip, uint256 limit']) as any,
       inputParams,
     )
-    return gaugesWeightBytecode.concat(inputData.slice(2))
+    return concatBytecode(gaugesWeightBytecode, inputData)
   })
 
   const gaugesWeights = await batchJsonRpc({
@@ -39,7 +40,7 @@ export const getGaugesWeights = async (rpc: string): Promise<GaugesWeightsData>
     calls: gaugesWeightsCalls,
     outputTypeAbi: getCurveDataGaugesWeightsOutputTypeAbi,
     parse: false,
-    callsKey: 'Fetch Curve Gauges Weights',
+    callsKey: `strategies/curve/fetch/curveApiData/getGaugesWeights.ts: gaugesWeights - chainId ${1} - rpc ${rpc}`,
   })
 
   return {

package/src/strategies/curve/fetch/curveApiData/getPoolsFromRegistries.ts.ts

@@ -1,6 +1,7 @@
 import { range } from 'lodash-es'
 import { encodeAbiParameters, parseAbiParameters } from 'viem'
 import { batchJsonRpc } from '../../../../utils.js'
+import { concatBytecode } from '../../../utils/index.js'
 import { getCurveDataPoolsOutputTypeAbi } from './abi.js'
 import { curveApiDataBytecodes } from './bytecode.js'
 import { CHUNK_SIZE } from './config.js'
@@ -18,7 +19,7 @@ export const getPoolsFromRegistries = async (rpc: string, lendingCallsStartIndex
         parseAbiParameters(['address _registry, uint256 skip, uint256 limit']) as any,
         inputParams,
       )
-      return curveApiDataBytecodes[registry.bytecodeIndex]?.concat(inputData.slice(2))
+      return concatBytecode(curveApiDataBytecodes[registry.bytecodeIndex]!, inputData)
     }),
   )
 
@@ -29,7 +30,7 @@ export const getPoolsFromRegistries = async (rpc: string, lendingCallsStartIndex
       getCurveDataPoolsOutputTypeAbi(index >= lendingCallsStartIndex),
     ),
     parse: false,
-    callsKey: 'Fetch Curve Apis Data',
+    callsKey: `strategies/curve/fetch/curveApiData/getPoolsFromRegistries.ts: pools - rpc ${rpc}`,
   })
 
   return pools

package/src/strategies/curve/fetch/index.ts

@@ -1,8 +1,16 @@
 import { formatUnits } from 'viem'
 
 import { ONE_YEAR, curveStrats, mainnet, tokenWithId } from '@stake-dao/constants'
+import type { Price } from '../../../prices.js'
 import { equalTlc } from '../../../utils.js'
-import type { CurveGlobalData, OnlyBoostData, RewardsData, StrategyData } from '../../types.js'
+import type {
+  CurveGlobalData,
+  OnlyBoostData,
+  RewardsData,
+  StrategyData,
+  ValidChainId,
+  ValidExplorer,
+} from '../../types.js'
 import { getBoost } from '../../utils/boost.js'
 import decodeEtherscanFactoryEvent, { decodeNewFactoryEvent } from '../../utils/decodeEtherscanFactoryEvent.js'
 import { getAprBreakdown } from '../../utils/getAprBreakdown.js'
@@ -16,17 +24,29 @@ import { getCvxApr } from './getCvxApr.js'
 import getOnlyboostData from './getOnlyboostData.js'
 import { getCurveStratsWithApr } from './getStratsWithApr.js'
 
-export const fetchCurve = async (
-  prices: any, // TODO Type
-  provider: any,
-  rpc: string,
-  explorerApiKey: string,
-  explorer: string,
-  chainId: number,
-  lastBlockNumber: number,
-  sdtEmissionData: SdtEmissionData,
-  gaugesWeights: GaugesWeightsData,
-): Promise<StrategyData> => {
+interface TFetchCurve {
+  prices: Price[]
+  provider: any
+  rpc: string
+  explorerApiKey: string
+  explorer: ValidExplorer
+  chainId: ValidChainId
+  lastBlockNumber: number
+  sdtEmissionData: SdtEmissionData
+  gaugesWeights: GaugesWeightsData
+}
+
+export const fetchCurve = async ({
+  prices,
+  provider,
+  rpc,
+  explorerApiKey,
+  explorer,
+  chainId,
+  lastBlockNumber,
+  sdtEmissionData,
+  gaugesWeights,
+}: TFetchCurve): Promise<StrategyData> => {
   const apisData = await getCurveHttpCalls(explorerApiKey, explorer, rpc, chainId, lastBlockNumber, gaugesWeights)
 
   const newVaultAndLp =
@@ -178,7 +198,20 @@ export const fetchCurve = async (
       const apr = getAprBreakdown(strat, rewardsData, boost, sdtApr, cvxApr)
 
       return {
-        ...strat,
+        key: strat.key,
+        name: strat.name,
+        type: strat.type,
+        protocol: strat.protocol,
+        chainId: strat.chainId,
+        isMetapool: strat.isMetapool,
+        isLending: strat.isLending,
+        vault: strat.vault,
+        lpToken: strat.lpToken,
+        gaugeAddress: strat.gaugeAddress,
+        coins: strat.coins,
+        underlyingCoins: strat.underlyingCoins,
+        sdGauge,
+        lpPriceInUsd: strat.lpPriceInUsd,
         tvl,
         apr: {
           boost,
@@ -202,12 +235,17 @@ export const fetchCurve = async (
         },
         sdtApr,
         rewards: rewardsData,
-
+        // Base APR data
+        tradingApy: strat.tradingApy,
+        gaugesProjectedApr: strat.gaugesProjectedApr,
+        minApr: strat.minApr,
+        maxApr: strat.maxApr,
+        // Raw data
         vaultHoldings: formatUnits(v.vaultHoldings, 0),
         totalSupply,
         strategyHoldings: formatUnits(v.strategyHoldings, 0),
         workingBalance: formatUnits(v.workingBalance, 0),
-        sdGauge,
+        // Gas optimised
         vaultFees:
           chainId === mainnet.id
             ? {

package/src/strategies/curve/httpCalls.ts

@@ -6,7 +6,7 @@ import {
   FACTORY_EXPLORER_EVENTS,
   NEW_FACTORY_EXPLORER_EVENTS,
 } from './endpoints.js'
-import { fetchCurveBase } from './fetch/curveApiData/getCurveApiData.js'
+import { getCurveApiData } from './fetch/curveApiData/getCurveApiData.js'
 import { type GaugesWeightsData } from './fetch/curveApiData/getGaugesWeights.js'
 
 export const getCurveHttpCalls = async (
@@ -32,7 +32,7 @@ export const getCurveHttpCalls = async (
           )
         ).json(),
         // Curve Data (replace APIs calls)
-        fetchCurveBase(rpc, chainId, gaugesWeights.gauges),
+        getCurveApiData(rpc, chainId, gaugesWeights.gauges),
         // Curve Trading Apy API
         (await fetch(`${CURVE_API_URL}/getSubgraphData/ethereum`)).json(),
         // Convex API for OnlyBoost
@@ -67,7 +67,7 @@ export const getCurveHttpCalls = async (
           )
         ).json(),
         // Curve Data (replace APIs calls)
-        fetchCurveBase(rpc, chainId, gaugesWeights.gauges),
+        getCurveApiData(rpc, chainId, gaugesWeights.gauges),
         // Curve Trading Apy API
         (await fetch(`${CURVE_API_URL}/getSubgraphData/arbitrum`)).json(),
       ]

package/src/strategies/curve/onChainCalls.ts

@@ -1,8 +1,9 @@
 import { contract, mainnet } from '@stake-dao/constants'
 import { chunk } from 'lodash-es'
 import { encodeAbiParameters, parseAbiParameters } from 'viem'
-import { batchCurveStrats } from '../../batches/index.js'
+import { batchCurveStrats } from '../../bytecodes/index.js'
 import { batchJsonRpc } from '../../utils.js'
+import { concatBytecode } from '../utils/index.js'
 
 export const getOnChainSdCurveData = async (chainId: number, rpc: string, calls: any[]) => {
   const inputArgsChunks = chunk(calls, 12)
@@ -22,7 +23,7 @@ export const getOnChainSdCurveData = async (chainId: number, rpc: string, calls:
       parseAbiParameters(batchCurveStrats.inputType[chainId] || []) as any,
       inputParams,
     )
-    return batchCurveStrats.bytecode[chainId]?.concat(inputData.slice(2)) as string
+    return concatBytecode(batchCurveStrats.bytecode[chainId]!, inputData)
   })
 
   const decodedPromise = await batchJsonRpc({
@@ -30,6 +31,7 @@ export const getOnChainSdCurveData = async (chainId: number, rpc: string, calls:
     calls: allContractCreationCodes,
     outputTypeAbi: batchCurveStrats.outputType ? batchCurveStrats.outputType[chainId] : [],
     parse: false,
+    callsKey: `strategies/curve/onChainCalls.ts: getOnChainSdCurveData - chainId ${chainId} - rpc ${rpc}`,
   })
 
   return decodedPromise