@curvefi/api 2.66.14 → 2.66.16

package/lib/pools/PoolTemplate.js

@@ -291,7 +291,8 @@ export class PoolTemplate extends CorePool {
                 const rewards = yield _getRewardsFromApi();
                 if (!rewards[this.gauge.address])
                     return [];
-                rewards[this.gauge.address].forEach((r) => _setContracts(r.tokenAddress, ERC20Abi));
+                // Don't reset ABI if its already set, we might override an LP token ABI
+                rewards[this.gauge.address].forEach((r) => !curve.contracts[r.tokenAddress] && _setContracts(r.tokenAddress, ERC20Abi));
                 return rewards[this.gauge.address].map((r) => ({ token: r.tokenAddress, symbol: r.symbol, decimals: Number(r.decimals) }));
             }
             const gaugeContract = curve.contracts[this.gauge.address].contract;
@@ -311,9 +312,9 @@ export class PoolTemplate extends CorePool {
                     .filter((addr) => curve.chainId === 1 || addr !== curve.constants.COINS.crv);
                 const tokenInfoCalls = [];
                 for (const token of tokens) {
-                    _setContracts(token, ERC20Abi);
-                    const tokenMulticallContract = curve.contracts[token].multicallContract;
-                    tokenInfoCalls.push(tokenMulticallContract.symbol(), tokenMulticallContract.decimals());
+                    // Don't reset ABI if its already set, we might override an LP token ABI
+                    const { multicallContract } = curve.contracts[token] || _setContracts(token, ERC20Abi);
+                    tokenInfoCalls.push(multicallContract.symbol(), multicallContract.decimals());
                 }
                 const tokenInfo = yield curve.multicallProvider.all(tokenInfoCalls);
                 for (let i = 0; i < tokens.length; i++) {

package/lib/pools/utils.js

@@ -130,7 +130,7 @@ const _getUserClaimable = (pools, address, useCache) => __awaiter(void 0, void 0
                 rewardTokenCalls.push(rewardMulticallContract[method]());
             }
         }
-        const rawRewardTokens = (yield curve.multicallProvider.all(rewardTokenCalls)).map((t) => t.toLowerCase());
+        const rawRewardTokens = (yield batchedMulticall(rewardTokenCalls)).map((t) => t.toLowerCase());
         const rewardTokens = {};
         for (let i = 0; i < poolsToFetch.length; i++) {
             rewardTokens[poolsToFetch[i]] = [];
@@ -159,9 +159,9 @@ const _getUserClaimable = (pools, address, useCache) => __awaiter(void 0, void 0
                 rewardInfoCalls.push(gaugeMulticallContract.claimable_tokens(address));
             }
             for (const token of rewardTokens[poolId]) {
-                _setContracts(token, ERC20Abi);
-                const tokenMulticallContract = curve.contracts[token].multicallContract;
-                rewardInfoCalls.push(tokenMulticallContract.symbol(), tokenMulticallContract.decimals());
+                // Don't reset the reward ABI if the reward is the LP token itself, otherwise we lose LP contract functions
+                const { multicallContract } = token === pool.address ? curve.contracts[token] : _setContracts(token, ERC20Abi);
+                rewardInfoCalls.push(multicallContract.symbol(), multicallContract.decimals());
                 if ('claimable_reward(address,address)' in gaugeContract) {
                     rewardInfoCalls.push(gaugeMulticallContract.claimable_reward(address, token));
                 }
@@ -170,7 +170,7 @@ const _getUserClaimable = (pools, address, useCache) => __awaiter(void 0, void 0
                 }
             }
         }
-        const rawRewardInfo = yield curve.multicallProvider.all(rewardInfoCalls);
+        const rawRewardInfo = yield batchedMulticall(rewardInfoCalls);
         for (let i = 0; i < poolsToFetch.length; i++) {
             const poolId = poolsToFetch[i];
             const pool = getPool(poolId);
@@ -191,7 +191,7 @@ const _getUserClaimable = (pools, address, useCache) => __awaiter(void 0, void 0
             }
             for (const token of rewardTokens[poolId]) {
                 const symbol = rawRewardInfo.shift();
-                const decimals = rawRewardInfo.shift();
+                const decimals = Number(rawRewardInfo.shift());
                 let _amount = rawRewardInfo.shift();
                 if ('claimable_reward(address)' in gaugeContract) {
                     const _claimedAmount = rawRewardInfo.shift();
@@ -245,7 +245,10 @@ const _getUserClaimableUseApi = (pools, address, useCache) => __awaiter(void 0,
                 rewardInfoCalls.push(gaugeMulticallContract.claimable_tokens(address));
             }
             for (const r of rewardTokens[poolId]) {
-                _setContracts(r.token, ERC20Abi);
+                // Don't reset the reward ABI if the reward is the LP token itself, otherwise we lose LP contract functions
+                if (r.token !== pool.address) {
+                    _setContracts(r.token, ERC20Abi);
+                }
                 if ('claimable_reward(address,address)' in gaugeContract) {
                     rewardInfoCalls.push(gaugeMulticallContract.claimable_reward(address, r.token));
                 }

package/lib/utils.d.ts

@@ -1,3 +1,5 @@
+import { Contract } from 'ethers';
+import { Contract as MulticallContract } from "@curvefi/ethcall";
 import BigNumber from 'bignumber.js';
 import { Abi, AbiFunction, IBasePoolShortItem, IChainId, ICurveLiteNetwork, IDict, INetworkName, IRewardFromApi, IVolumeAndAPYs, REFERENCE_ASSET } from './interfaces';
 export declare const ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
@@ -52,7 +54,11 @@ export declare const getVolume: (chainId?: number) => Promise<{
     cryptoVolume: number;
     cryptoShare: number;
 }>;
-export declare const _setContracts: (address: string, abi: any) => void;
+export declare const _setContracts: (address: string, abi: any) => {
+    abi: any;
+    contract: Contract;
+    multicallContract: MulticallContract;
+};
 export declare const _get_small_x: (_x: bigint, _y: bigint, x_decimals: number, y_decimals: number) => BigNumber;
 export declare const _get_price_impact: (_x: bigint, _y: bigint, _small_x: bigint, _small_y: bigint, x_decimals: number, y_decimals: number) => BigNumber;
 export declare const getCoinsData: (...coins: string[] | string[][]) => Promise<{

package/lib/utils.js

@@ -615,11 +615,13 @@ export const getVolume = (...args_1) => __awaiter(void 0, [...args_1], void 0, f
     return { totalVolume, cryptoVolume, cryptoShare };
 });
 export const _setContracts = (address, abi) => {
-    curve.contracts[address] = {
+    const contracts = {
         abi,
         contract: new Contract(address, abi, curve.signer || curve.provider),
         multicallContract: new MulticallContract(address, abi),
     };
+    curve.contracts[address] = contracts;
+    return contracts;
 };
 // Find k for which x * k = target_x or y * k = target_y
 // k = max(target_x / x, target_y / y)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.66.14",
+  "version": "2.66.16",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",