@curvefi/api 2.3.2 → 2.3.3

package/lib/factory/constants.d.ts

@@ -2,17 +2,18 @@ import { IDict } from "../interfaces";
 export declare const implementationABIDictEthereum: IDict<any>;
 export declare const implementationABIDictPolygon: IDict<any>;
 export declare const implementationABIDictAvalanche: IDict<any>;
-export declare const implementationBasePoolAddressDictEthereum: IDict<any>;
-export declare const implementationBasePoolAddressDictPolygon: IDict<any>;
-export declare const implementationBasePoolAddressDictAvalanche: IDict<any>;
-export declare const basePoolAddressIdDictEthereum: IDict<string>;
-export declare const basePoolAddressIdDictPolygon: IDict<string>;
-export declare const basePoolAddressIdDictAvalanche: IDict<string>;
+export declare const implementationBasePoolIdDictEthereum: IDict<string>;
+export declare const implementationBasePoolIdDictPolygon: IDict<string>;
+export declare const implementationBasePoolIdDictAvalanche: IDict<string>;
 export declare const basePoolIdZapDictEthereum: IDict<string>;
 export declare const basePoolIdZapDictPolygon: IDict<string>;
 export declare const basePoolIdZapDictAvalanche: IDict<string>;
 export declare const WETH_ADDRESS = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
 export declare const ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 export declare const FACTORY_CONSTANTS: {
-    [index: number]: any;
+    [index: number]: {
+        implementationABIDict: IDict<any>;
+        implementationBasePoolIdDict: IDict<string>;
+        basePoolIdZapDict: IDict<string>;
+    };
 };

package/lib/factory/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FACTORY_CONSTANTS = exports.ETH_ADDRESS = exports.WETH_ADDRESS = exports.basePoolIdZapDictAvalanche = exports.basePoolIdZapDictPolygon = exports.basePoolIdZapDictEthereum = exports.basePoolAddressIdDictAvalanche = exports.basePoolAddressIdDictPolygon = exports.basePoolAddressIdDictEthereum = exports.implementationBasePoolAddressDictAvalanche = exports.implementationBasePoolAddressDictPolygon = exports.implementationBasePoolAddressDictEthereum = exports.implementationABIDictAvalanche = exports.implementationABIDictPolygon = exports.implementationABIDictEthereum = void 0;
+exports.FACTORY_CONSTANTS = exports.ETH_ADDRESS = exports.WETH_ADDRESS = exports.basePoolIdZapDictAvalanche = exports.basePoolIdZapDictPolygon = exports.basePoolIdZapDictEthereum = exports.implementationBasePoolIdDictAvalanche = exports.implementationBasePoolIdDictPolygon = exports.implementationBasePoolIdDictEthereum = exports.implementationABIDictAvalanche = exports.implementationABIDictPolygon = exports.implementationABIDictEthereum = void 0;
 var swap_json_1 = __importDefault(require("../constants/abis/factoryPools/swap.json"));
 var MetaUSD_json_1 = __importDefault(require("../constants/abis/factory-v2/MetaUSD.json"));
 var MetaUSDBalances_json_1 = __importDefault(require("../constants/abis/factory-v2/MetaUSDBalances.json"));
@@ -84,42 +84,28 @@ exports.implementationABIDictAvalanche = {
     "0x0eb0F1FaF5F509Ac53fA224477509EAD167cf410": Plain4ETH_json_1.default,
     "0xCE94D3E5b0D80565D7B713A687b39a3Dc81780BA": Plain4Optimized_json_1.default,
 };
-exports.implementationBasePoolAddressDictEthereum = {
-    "0x5F890841f657d90E081bAbdB532A05996Af79Fe6": "0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7",
-    "0x213be373FDff327658139C7df330817DAD2d5bBE": "0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7",
-    "0x55Aa9BF126bCABF0bDC17Fa9E39Ec9239e1ce7A9": "0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7",
-    "0x33bB0e62d5e8C688E645Dd46DFb48Cd613250067": "0xDcEF968d416a41Cdac0ED8702fAC8128A64241A2",
-    "0x2EB24483Ef551dA247ab87Cf18e1Cc980073032D": "0xDcEF968d416a41Cdac0ED8702fAC8128A64241A2",
-    "0xC6A8466d128Fbfd34AdA64a9FFFce325D57C9a52": "0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714",
-    "0xc4C78b08fA0c3d0a312605634461A88184Ecd630": "0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714",
-    "0xECAaecd9d2193900b424774133B1f51ae0F29d9E": "0x93054188d876f558f4a66B2EF1d97d16eDf0895B",
-    "0x40fD58D44cFE63E8517c9Bb3ac98676838Ea56A8": "0x93054188d876f558f4a66B2EF1d97d16eDf0895B", // ren
+exports.implementationBasePoolIdDictEthereum = {
+    "0x5F890841f657d90E081bAbdB532A05996Af79Fe6": "3pool",
+    "0x213be373FDff327658139C7df330817DAD2d5bBE": "3pool",
+    "0x55Aa9BF126bCABF0bDC17Fa9E39Ec9239e1ce7A9": "3pool",
+    "0x33bB0e62d5e8C688E645Dd46DFb48Cd613250067": "fraxusdc",
+    "0x2EB24483Ef551dA247ab87Cf18e1Cc980073032D": "fraxusdc",
+    "0xC6A8466d128Fbfd34AdA64a9FFFce325D57C9a52": "sbtc",
+    "0xc4C78b08fA0c3d0a312605634461A88184Ecd630": "sbtc",
+    "0xECAaecd9d2193900b424774133B1f51ae0F29d9E": "ren",
+    "0x40fD58D44cFE63E8517c9Bb3ac98676838Ea56A8": "ren",
 };
-exports.implementationBasePoolAddressDictPolygon = {
-    "0x4fb93D7d320E8A263F22f62C2059dFC2A8bCbC4c": "0x445FE580eF8d70FF569aB36e80c647af338db351",
-    "0x39fE1824f98CD828050D7c51dA443E84121c7cf1": "0x445FE580eF8d70FF569aB36e80c647af338db351",
-    "0xC05EB760A135d3D0c839f1141423002681157a17": "0xC2d95EEF97Ec6C17551d45e77B590dc1F9117C67",
-    "0xD8336532f6ED7b94282fAF724fe41d6145E07Cfc": "0xC2d95EEF97Ec6C17551d45e77B590dc1F9117C67", // ren
+exports.implementationBasePoolIdDictPolygon = {
+    "0x4fb93D7d320E8A263F22f62C2059dFC2A8bCbC4c": "aave",
+    "0x39fE1824f98CD828050D7c51dA443E84121c7cf1": "aave",
+    "0xC05EB760A135d3D0c839f1141423002681157a17": "ren",
+    "0xD8336532f6ED7b94282fAF724fe41d6145E07Cfc": "ren",
 };
-exports.implementationBasePoolAddressDictAvalanche = {
-    "0xA237034249290De2B07988Ac64b96f22c0E76fE0": "0x7f90122BF0700F9E7e1F688fe926940E8839F353",
-    "0xc50C05Ca1f8C2346664bd0d4a1eb6aC1Da38414f": "0x7f90122BF0700F9E7e1F688fe926940E8839F353",
-    "0xa27f39E9C21b3376F43266E13Ad5A5d6E9BdB320": "0x16a7DA911A4DD1d83F3fF066fE28F3C792C50d90",
-    "0x505C34ED8dBE96d2D5C7D83158aA844887770970": "0x16a7DA911A4DD1d83F3fF066fE28F3C792C50d90", // ren
-};
-exports.basePoolAddressIdDictEthereum = {
-    "0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7": "3pool",
-    "0xDcEF968d416a41Cdac0ED8702fAC8128A64241A2": "fraxusdc",
-    "0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714": "sbtc",
-    "0x93054188d876f558f4a66B2EF1d97d16eDf0895B": "ren",
-};
-exports.basePoolAddressIdDictPolygon = {
-    "0x445FE580eF8d70FF569aB36e80c647af338db351": "aave",
-    "0xC2d95EEF97Ec6C17551d45e77B590dc1F9117C67": "ren",
-};
-exports.basePoolAddressIdDictAvalanche = {
-    "0x7f90122BF0700F9E7e1F688fe926940E8839F353": "aave",
-    "0x16a7DA911A4DD1d83F3fF066fE28F3C792C50d90": "ren",
+exports.implementationBasePoolIdDictAvalanche = {
+    "0xA237034249290De2B07988Ac64b96f22c0E76fE0": "aave",
+    "0xc50C05Ca1f8C2346664bd0d4a1eb6aC1Da38414f": "aave",
+    "0xa27f39E9C21b3376F43266E13Ad5A5d6E9BdB320": "ren",
+    "0x505C34ED8dBE96d2D5C7D83158aA844887770970": "ren",
 };
 exports.basePoolIdZapDictEthereum = {
     '3pool': "0xA79828DF1850E8a3A3064576f380D90aECDD3359".toLowerCase(),
@@ -140,20 +126,17 @@ exports.ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 exports.FACTORY_CONSTANTS = {
     1: {
         implementationABIDict: exports.implementationABIDictEthereum,
-        implementationBasePoolAddressDict: exports.implementationBasePoolAddressDictEthereum,
-        basePoolAddressIdDict: exports.basePoolAddressIdDictEthereum,
+        implementationBasePoolIdDict: exports.implementationBasePoolIdDictEthereum,
         basePoolIdZapDict: exports.basePoolIdZapDictEthereum,
     },
     137: {
         implementationABIDict: exports.implementationABIDictPolygon,
-        implementationBasePoolAddressDict: exports.implementationBasePoolAddressDictPolygon,
-        basePoolAddressIdDict: exports.basePoolAddressIdDictPolygon,
+        implementationBasePoolIdDict: exports.implementationBasePoolIdDictPolygon,
         basePoolIdZapDict: exports.basePoolIdZapDictPolygon,
     },
     43114: {
         implementationABIDict: exports.implementationABIDictAvalanche,
-        implementationBasePoolAddressDict: exports.implementationBasePoolAddressDictAvalanche,
-        basePoolAddressIdDict: exports.basePoolAddressIdDictAvalanche,
+        implementationBasePoolIdDict: exports.implementationBasePoolIdDictAvalanche,
         basePoolIdZapDict: exports.basePoolIdZapDictAvalanche,
     },
 };

package/lib/factory/factory-api.js

@@ -188,16 +188,16 @@ function getFactoryPoolsDataFromApi(isCrypto) {
                         }
                         else if (pool.implementation.startsWith("meta")) {
                             var implementationABIDict = constants_1.FACTORY_CONSTANTS[_this.chainId].implementationABIDict;
-                            var implementationBasePoolAddressDict = constants_1.FACTORY_CONSTANTS[_this.chainId].implementationBasePoolAddressDict;
-                            var basePoolAddressIdDict = constants_1.FACTORY_CONSTANTS[_this.chainId].basePoolAddressIdDict; // @ts-ignore
-                            var basePoolIdCoinsDict = Object.fromEntries(Object.values(basePoolAddressIdDict).map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coins]; }));
+                            var implementationBasePoolIdDict = constants_1.FACTORY_CONSTANTS[_this.chainId].implementationBasePoolIdDict;
+                            var basePoolIds = Object.values(implementationBasePoolIdDict).filter(function (poolId, i, arr) { return arr.indexOf(poolId) === i; });
                             // @ts-ignore
-                            var basePoolIdCoinAddressesDict = Object.fromEntries(Object.values(basePoolAddressIdDict).map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coin_addresses]; }));
+                            var basePoolIdCoinsDict = Object.fromEntries(basePoolIds.map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coins]; }));
                             // @ts-ignore
-                            var basePoolIdDecimalsDict = Object.fromEntries(Object.values(basePoolAddressIdDict).map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_decimals]; }));
+                            var basePoolIdCoinAddressesDict = Object.fromEntries(basePoolIds.map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coin_addresses]; }));
+                            // @ts-ignore
+                            var basePoolIdDecimalsDict = Object.fromEntries(basePoolIds.map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_decimals]; }));
                             var basePoolIdZapDict = constants_1.FACTORY_CONSTANTS[_this.chainId].basePoolIdZapDict;
-                            var basePoolAddress = implementationBasePoolAddressDict[pool.implementationAddress];
-                            var basePoolId = basePoolAddressIdDict[basePoolAddress];
+                            var basePoolId = implementationBasePoolIdDict[pool.implementationAddress];
                             var basePoolCoinNames = basePoolIdCoinsDict[basePoolId];
                             var basePoolCoinAddresses = basePoolIdCoinAddressesDict[basePoolId];
                             var basePoolDecimals = basePoolIdDecimalsDict[basePoolId];

package/lib/factory/factory.js

@@ -94,14 +94,12 @@ function getFactoryIdsAndSwapAddresses() {
         });
     });
 }
-function getFactorySwapABIs(factorySwapAddresses) {
+function getFactoryImplementations(factorySwapAddresses) {
     return __awaiter(this, void 0, void 0, function () {
-        var implementationABIDict, factoryMulticallContract, calls, _i, factorySwapAddresses_1, addr, implementationAddresses;
+        var factoryMulticallContract, calls, _i, factorySwapAddresses_1, addr;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    implementationABIDict = constants_1.FACTORY_CONSTANTS[this.chainId].implementationABIDict;
-                    return [4 /*yield*/, this.contracts[this.constants.ALIASES.factory].multicallContract];
+                case 0: return [4 /*yield*/, this.contracts[this.constants.ALIASES.factory].multicallContract];
                 case 1:
                     factoryMulticallContract = _a.sent();
                     calls = [];
@@ -110,9 +108,7 @@ function getFactorySwapABIs(factorySwapAddresses) {
                         calls.push(factoryMulticallContract.get_implementation_address(addr));
                     }
                     return [4 /*yield*/, this.multicallProvider.all(calls)];
-                case 2:
-                    implementationAddresses = _a.sent();
-                    return [2 /*return*/, implementationAddresses.map(function (addr) { return implementationABIDict[addr]; })];
+                case 2: return [2 /*return*/, _a.sent()];
             }
         });
     });
@@ -349,37 +345,20 @@ function getFactoryIsMeta(factorySwapAddresses) {
         });
     });
 }
-function getFactoryBasePoolAddresses(factorySwapAddresses) {
-    return __awaiter(this, void 0, void 0, function () {
-        var factoryMulticallContract, calls, _i, factorySwapAddresses_7, addr;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, this.contracts[this.constants.ALIASES.factory].multicallContract];
-                case 1:
-                    factoryMulticallContract = _a.sent();
-                    calls = [];
-                    for (_i = 0, factorySwapAddresses_7 = factorySwapAddresses; _i < factorySwapAddresses_7.length; _i++) {
-                        addr = factorySwapAddresses_7[_i];
-                        calls.push(factoryMulticallContract.get_base_pool(addr));
-                    }
-                    return [4 /*yield*/, this.multicallProvider.all(calls)];
-                case 2: return [2 /*return*/, _a.sent()];
-            }
-        });
-    });
-}
 function getFactoryPoolData() {
     return __awaiter(this, void 0, void 0, function () {
-        var _a, poolIds, swapAddresses, swapABIs, gaugeAddresses, _b, poolSymbols, poolNames, referenceAssets, coinAddresses, existingCoinAddressNameDict, coinAddressNameDict, coinAddressDecimalsDict, isMeta, basePoolAddresses, basePoolAddressIdDict, basePoolIds, basePoolIdCoinsDict, basePoolIdCoinAddressesDict, basePoolIdDecimalsDict, basePoolIdZapDict, FACTORY_POOLS_DATA, i;
+        var _a, poolIds, swapAddresses, implementations, implementationABIDict, swapABIs, gaugeAddresses, _b, poolSymbols, poolNames, referenceAssets, coinAddresses, existingCoinAddressNameDict, coinAddressNameDict, coinAddressDecimalsDict, isMeta, implementationBasePoolIdDict, basePoolIds, basePoolIdCoinsDict, basePoolIdCoinAddressesDict, basePoolIdDecimalsDict, basePoolIdZapDict, FACTORY_POOLS_DATA, i;
         var _this = this;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0: return [4 /*yield*/, getFactoryIdsAndSwapAddresses.call(this)];
                 case 1:
                     _a = _c.sent(), poolIds = _a[0], swapAddresses = _a[1];
-                    return [4 /*yield*/, getFactorySwapABIs.call(this, swapAddresses)];
+                    return [4 /*yield*/, getFactoryImplementations.call(this, swapAddresses)];
                 case 2:
-                    swapABIs = _c.sent();
+                    implementations = _c.sent();
+                    implementationABIDict = constants_1.FACTORY_CONSTANTS[this.chainId].implementationABIDict;
+                    swapABIs = implementations.map(function (addr) { return implementationABIDict[addr]; });
                     setFactorySwapContracts.call(this, swapAddresses, swapABIs);
                     return [4 /*yield*/, getFactoryGaugeAddresses.call(this, swapAddresses)];
                 case 3:
@@ -405,15 +384,12 @@ function getFactoryPoolData() {
                     return [4 /*yield*/, getFactoryIsMeta.call(this, swapAddresses)];
                 case 9:
                     isMeta = _c.sent();
-                    return [4 /*yield*/, getFactoryBasePoolAddresses.call(this, swapAddresses)];
-                case 10:
-                    basePoolAddresses = _c.sent();
+                    implementationBasePoolIdDict = constants_1.FACTORY_CONSTANTS[this.chainId].implementationBasePoolIdDict;
+                    basePoolIds = implementations.map(function (addr) { return implementationBasePoolIdDict[addr]; });
                     common_1.setFactoryZapContracts.call(this);
-                    basePoolAddressIdDict = constants_1.FACTORY_CONSTANTS[this.chainId].basePoolAddressIdDict;
-                    basePoolIds = basePoolAddresses.map(function (addr) { return basePoolAddressIdDict[addr]; });
-                    basePoolIdCoinsDict = Object.fromEntries(Object.values(basePoolAddressIdDict).map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coins]; }));
-                    basePoolIdCoinAddressesDict = Object.fromEntries(Object.values(basePoolAddressIdDict).map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coin_addresses]; }));
-                    basePoolIdDecimalsDict = Object.fromEntries(Object.values(basePoolAddressIdDict).map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_decimals]; }));
+                    basePoolIdCoinsDict = Object.fromEntries(basePoolIds.map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coins]; }));
+                    basePoolIdCoinAddressesDict = Object.fromEntries(basePoolIds.map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_coin_addresses]; }));
+                    basePoolIdDecimalsDict = Object.fromEntries(basePoolIds.map(function (poolId) { return [poolId, _this.constants.POOLS_DATA[poolId].underlying_decimals]; }));
                     basePoolIdZapDict = constants_1.FACTORY_CONSTANTS[this.chainId].basePoolIdZapDict;
                     FACTORY_POOLS_DATA = {};
                     for (i = 0; i < poolIds.length; i++) {

package/lib/pools/PoolTemplate.js

@@ -1225,9 +1225,9 @@ var PoolTemplate = /** @class */ (function () {
     PoolTemplate.prototype.claimableRewards = function (address) {
         if (address === void 0) { address = ""; }
         return __awaiter(this, void 0, void 0, function () {
-            var gaugeContract, rewardTokens, rewards, _i, rewardTokens_2, rewardToken, amount, _a, _c, rewardToken, _totalAmount, _claimedAmount;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var gaugeContract, rewardTokens, rewards, _i, rewardTokens_2, rewardToken, _amount, rewardToken, _totalAmount, _claimedAmount;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         if (this.gauge === ethers_1.ethers.constants.AddressZero) {
                             throw Error("claimableRewards method doesn't exist for pool ".concat(this.name, " (id: ").concat(this.name, "). There is no gauge"));
@@ -1238,24 +1238,23 @@ var PoolTemplate = /** @class */ (function () {
                         gaugeContract = curve_1.curve.contracts[this.gauge].contract;
                         return [4 /*yield*/, this.rewardTokens()];
                     case 1:
-                        rewardTokens = _d.sent();
+                        rewardTokens = _a.sent();
                         rewards = [];
                         if (!('claimable_reward(address,address)' in gaugeContract)) return [3 /*break*/, 6];
                         _i = 0, rewardTokens_2 = rewardTokens;
-                        _d.label = 2;
+                        _a.label = 2;
                     case 2:
                         if (!(_i < rewardTokens_2.length)) return [3 /*break*/, 5];
                         rewardToken = rewardTokens_2[_i];
-                        _c = (_a = ethers_1.ethers.utils).formatUnits;
-                        return [4 /*yield*/, gaugeContract.claimable_reward(address, rewardToken, curve_1.curve.constantOptions)];
+                        return [4 /*yield*/, gaugeContract.claimable_reward(address, rewardToken.token, curve_1.curve.constantOptions)];
                     case 3:
-                        amount = _c.apply(_a, [_d.sent(), rewardToken.decimals]);
+                        _amount = _a.sent();
                         rewards.push({
                             token: rewardToken.token,
                             symbol: rewardToken.symbol,
-                            amount: amount,
+                            amount: ethers_1.ethers.utils.formatUnits(_amount, rewardToken.decimals),
                         });
-                        _d.label = 4;
+                        _a.label = 4;
                     case 4:
                         _i++;
                         return [3 /*break*/, 2];
@@ -1265,16 +1264,16 @@ var PoolTemplate = /** @class */ (function () {
                         rewardToken = rewardTokens[0];
                         return [4 /*yield*/, gaugeContract.claimable_reward(address, curve_1.curve.constantOptions)];
                     case 7:
-                        _totalAmount = _d.sent();
+                        _totalAmount = _a.sent();
                         return [4 /*yield*/, gaugeContract.claimed_rewards_for(address, curve_1.curve.constantOptions)];
                     case 8:
-                        _claimedAmount = _d.sent();
+                        _claimedAmount = _a.sent();
                         rewards.push({
                             token: rewardToken.token,
                             symbol: rewardToken.symbol,
                             amount: ethers_1.ethers.utils.formatUnits(_totalAmount.sub(_claimedAmount), rewardToken.decimals),
                         });
-                        _d.label = 9;
+                        _a.label = 9;
                     case 9: return [2 /*return*/, rewards];
                 }
             });

package/package.json

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