@curvefi/api 1.7.0 → 1.9.1

package/README.md

@@ -580,12 +580,6 @@ await pool.exchangeIsApproved("DAI", "1000")
 await pool.exchangeApprove("DAI", "1000")
 
 
-// --- Exchange Tricrypto ---
-
-await pool.exchangeIsApproved(0, "1000")
-await pool.exchangeApprove(0, "1000")
-
-
 // --- Exchange Wrapped ---
 
 await pool.exchangeWrappedIsApproved("0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490", "1000")
@@ -595,8 +589,13 @@ await pool.exchangeWrappedApprove("0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490",
 
 ### Exchange
 ```ts
+// Straight
 await curve.exchangeisApproved("DAI", "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3", "1000"); // DAI -> MIM
 await curve.exchangeApprove("DAI", "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3", "1000"); // DAI -> MIM
+
+// Cross-Asset
+await curve.crossAssetExchangeIsApproved("DAI", "1000");
+await curve.crossAssetExchangeApprove("DAI", "1000");
 ```
 
 ### Boosting

package/lib/boosting.js

@@ -199,7 +199,7 @@ var createLockEstimateGas = function (amount, days) { return __awaiter(void 0, v
             case 1:
                 crvBalance = _a.sent();
                 if (Number(crvBalance) < Number(amount)) {
-                    throw Error("Not enough . Actual: " + crvBalance + ", required: " + amount);
+                    throw Error("Not enough . Actual: ".concat(crvBalance, ", required: ").concat(amount));
                 }
                 return [4 /*yield*/, (0, utils_1.hasAllowance)([curve_1.ALIASES.crv], [amount], curve_1.curve.signerAddress, curve_1.ALIASES.voting_escrow)];
             case 2:
@@ -245,7 +245,7 @@ var increaseAmountEstimateGas = function (amount) { return __awaiter(void 0, voi
             case 1:
                 crvBalance = _a.sent();
                 if (Number(crvBalance) < Number(amount)) {
-                    throw Error("Not enough. Actual: " + crvBalance + ", required: " + amount);
+                    throw Error("Not enough. Actual: ".concat(crvBalance, ", required: ").concat(amount));
                 }
                 return [4 /*yield*/, (0, utils_1.hasAllowance)([curve_1.ALIASES.crv], [amount], curve_1.curve.signerAddress, curve_1.ALIASES.voting_escrow)];
             case 2:

package/lib/constants/abis/abis-ethereum.js

@@ -1414,12 +1414,12 @@ exports.poolsData = {
         swap_address: '0xD51a44d3FaE010294C616388b506AcdA1bfAAE46',
         token_address: '0xc4AD29ba4B3c580e6D59105FFf484999997675Ff',
         gauge_address: '0xDeFd8FdD20e0f34115C7018CCfb655796F6B2168',
-        underlying_coins: ['USDT', 'WBTC', 'WETH'],
+        underlying_coins: ['USDT', 'WBTC', 'ETH'],
         coins: ['USDT', 'WBTC', 'WETH'],
         underlying_coin_addresses: [
             '0xdAC17F958D2ee523a2206206994597C13D831ec7',
             '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
-            '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+            '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
         ],
         coin_addresses: [
             '0xdAC17F958D2ee523a2206206994597C13D831ec7',

package/lib/constants/abis/json/registry_exchange.json

@@ -155,43 +155,6 @@
             }
         ]
     },
-    {
-        "stateMutability": "payable",
-        "type": "function",
-        "name": "exchange",
-        "inputs": [
-            {
-                "name": "_pool",
-                "type": "address"
-            },
-            {
-                "name": "_from",
-                "type": "address"
-            },
-            {
-                "name": "_to",
-                "type": "address"
-            },
-            {
-                "name": "_amount",
-                "type": "uint256"
-            },
-            {
-                "name": "_expected",
-                "type": "uint256"
-            },
-            {
-                "name": "_receiver",
-                "type": "address"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256"
-            }
-        ]
-    },
     {
         "stateMutability": "view",
         "type": "function",

package/lib/constants/abis/json/tricrypto2/deposit.json

@@ -35,52 +35,6 @@
             }
         ]
     },
-    {
-        "stateMutability": "payable",
-        "type": "function",
-        "name": "add_liquidity",
-        "inputs": [
-            {
-                "name": "_amounts",
-                "type": "uint256[3]"
-            },
-            {
-                "name": "_min_mint_amount",
-                "type": "uint256"
-            },
-            {
-                "name": "_receiver",
-                "type": "address"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256"
-            }
-        ]
-    },
-    {
-        "stateMutability": "nonpayable",
-        "type": "function",
-        "name": "remove_liquidity",
-        "inputs": [
-            {
-                "name": "_amount",
-                "type": "uint256"
-            },
-            {
-                "name": "_min_amounts",
-                "type": "uint256[3]"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256[3]"
-            }
-        ]
-    },
     {
         "stateMutability": "nonpayable",
         "type": "function",
@@ -93,10 +47,6 @@
             {
                 "name": "_min_amounts",
                 "type": "uint256[3]"
-            },
-            {
-                "name": "_receiver",
-                "type": "address"
             }
         ],
         "outputs": [
@@ -131,35 +81,6 @@
             }
         ]
     },
-    {
-        "stateMutability": "nonpayable",
-        "type": "function",
-        "name": "remove_liquidity_one_coin",
-        "inputs": [
-            {
-                "name": "_token_amount",
-                "type": "uint256"
-            },
-            {
-                "name": "i",
-                "type": "uint256"
-            },
-            {
-                "name": "_min_amount",
-                "type": "uint256"
-            },
-            {
-                "name": "_receiver",
-                "type": "address"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256"
-            }
-        ]
-    },
     {
         "stateMutability": "view",
         "type": "function",

package/lib/curve.d.ts

@@ -11,6 +11,7 @@ export declare const ALIASES: {
     fee_distributor: string;
     address_provider: string;
     router: string;
+    registry_exchange: string;
 };
 declare class Curve {
     provider: ethers.providers.Web3Provider | ethers.providers.JsonRpcProvider;

package/lib/curve.js

@@ -46,6 +46,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -61,6 +70,7 @@ var votingescrow_json_1 = __importDefault(require("./constants/abis/json/votinge
 var address_provider_json_1 = __importDefault(require("./constants/abis/json/address_provider.json"));
 var gaugecontroller_json_1 = __importDefault(require("./constants/abis/json/gaugecontroller.json"));
 var router_json_1 = __importDefault(require("./constants/abis/json/router.json"));
+var registry_exchange_json_1 = __importDefault(require("./constants/abis/json/registry_exchange.json"));
 var abis_ethereum_1 = require("./constants/abis/abis-ethereum");
 exports.ALIASES = {
     "crv": "0xD533a949740bb3306d119CC777fa900bA034cd52",
@@ -72,6 +82,7 @@ exports.ALIASES = {
     "fee_distributor": "0xA464e6DCda8AC41e03616F95f4BC98a13b8922Dc",
     "address_provider": "0x0000000022d53366457f9d5e68ec105046fc4383",
     "router": "0xfA9a30350048B2BF66865ee20363067c66f67e58",
+    "registry_exchange": "",
 };
 var cTokens = [
     '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643',
@@ -101,6 +112,7 @@ var aTokens = [
     "0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811",
     "0x6c5024cd4f8a59110119c56f8933403a539555eb", // sSUSD
 ];
+var customAbiTokens = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], cTokens, true), yTokens, true), ycTokens, true), aTokens, true);
 var Curve = /** @class */ (function () {
     function Curve() {
         // @ts-ignore
@@ -119,9 +131,9 @@ var Curve = /** @class */ (function () {
     ) {
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, _i, _b, pool, _c, _d, coinAddr, _e, _f, coinAddr;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
+            var _a, _i, _b, pool, _c, _d, coinAddr, _e, _f, coinAddr, _g, _h, coinAddr, addressProviderContract, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         // JsonRpc provider
                         if (providerType.toLowerCase() === 'JsonRpc'.toLowerCase()) {
@@ -160,20 +172,20 @@ var Curve = /** @class */ (function () {
                         this.multicallProvider = new ethers_multicall_1.Provider(this.provider);
                         return [4 /*yield*/, this.multicallProvider.init()];
                     case 2:
-                        _g.sent();
-                        _g.label = 3;
+                        _k.sent();
+                        _k.label = 3;
                     case 3:
                         if (!this.signer) return [3 /*break*/, 5];
                         _a = this;
                         return [4 /*yield*/, this.signer.getAddress()];
                     case 4:
-                        _a.signerAddress = _g.sent();
-                        _g.label = 5;
+                        _a.signerAddress = _k.sent();
+                        _k.label = 5;
                     case 5:
                         this.feeData = { gasPrice: options.gasPrice, maxFeePerGas: options.maxFeePerGas, maxPriorityFeePerGas: options.maxPriorityFeePerGas };
                         return [4 /*yield*/, this.updateFeeData()];
                     case 6:
-                        _g.sent();
+                        _k.sent();
                         // TODO delete toLowerCase()
                         for (_i = 0, _b = Object.values(abis_ethereum_1.poolsData); _i < _b.length; _i++) {
                             pool = _b[_i];
@@ -224,9 +236,22 @@ var Curve = /** @class */ (function () {
                                     multicallContract: new ethers_multicall_1.Contract(coinAddr, ERC20_json_1.default),
                                 };
                             }
-                            // TODO add all coins
                             for (_e = 0, _f = pool.coin_addresses; _e < _f.length; _e++) {
                                 coinAddr = _f[_e];
+                                if (customAbiTokens.includes(coinAddr))
+                                    continue;
+                                this.contracts[coinAddr] = {
+                                    contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
+                                    multicallContract: new ethers_multicall_1.Contract(coinAddr, ERC20_json_1.default),
+                                };
+                                this.contracts[coinAddr.toLowerCase()] = {
+                                    contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
+                                    multicallContract: new ethers_multicall_1.Contract(coinAddr, ERC20_json_1.default),
+                                };
+                            }
+                            // TODO add all coins
+                            for (_g = 0, _h = pool.coin_addresses; _g < _h.length; _g++) {
+                                coinAddr = _h[_g];
                                 if (cTokens.includes(coinAddr)) {
                                     this.contracts[coinAddr] = {
                                         contract: new ethers_1.Contract(coinAddr, cERC20_json_1.default, this.signer || this.provider),
@@ -283,6 +308,19 @@ var Curve = /** @class */ (function () {
                             contract: new ethers_1.Contract(exports.ALIASES.address_provider, address_provider_json_1.default, this.signer || this.provider),
                             multicallContract: new ethers_multicall_1.Contract(exports.ALIASES.address_provider, address_provider_json_1.default),
                         };
+                        addressProviderContract = this.contracts[exports.ALIASES.address_provider].contract;
+                        _j = exports.ALIASES;
+                        return [4 /*yield*/, addressProviderContract.get_address(2, this.constantOptions)];
+                    case 7:
+                        _j.registry_exchange = _k.sent();
+                        this.contracts[exports.ALIASES.registry_exchange] = {
+                            contract: new ethers_1.Contract(exports.ALIASES.registry_exchange, registry_exchange_json_1.default, this.signer || this.provider),
+                            multicallContract: new ethers_multicall_1.Contract(exports.ALIASES.registry_exchange, registry_exchange_json_1.default),
+                        };
+                        this.contracts[exports.ALIASES.registry_exchange.toLowerCase()] = {
+                            contract: new ethers_1.Contract(exports.ALIASES.registry_exchange, registry_exchange_json_1.default, this.signer || this.provider),
+                            multicallContract: new ethers_multicall_1.Contract(exports.ALIASES.registry_exchange, registry_exchange_json_1.default),
+                        };
                         this.contracts[exports.ALIASES.gauge_controller] = {
                             contract: new ethers_1.Contract(exports.ALIASES.gauge_controller, gaugecontroller_json_1.default, this.signer || this.provider),
                             multicallContract: new ethers_multicall_1.Contract(exports.ALIASES.gauge_controller, gaugecontroller_json_1.default),
@@ -342,7 +380,7 @@ var Curve = /** @class */ (function () {
                             feeData.maxFeePerGas;
                         this.options.maxPriorityFeePerGas = this.feeData.maxPriorityFeePerGas !== undefined ?
                             ethers_1.ethers.utils.parseUnits(this.feeData.maxPriorityFeePerGas.toString(), "gwei") :
-                            feeData.maxFeePerGas;
+                            feeData.maxPriorityFeePerGas;
                         _d.label = 7;
                     case 7: return [2 /*return*/];
                 }

package/lib/pools.d.ts

@@ -36,8 +36,6 @@ export declare class Pool {
         removeLiquidityOneCoinWrapped: (lpTokenAmount: string, coin: string | number) => Promise<number>;
         exchangeApprove: (inputCoin: string | number, amount: string) => Promise<number>;
         exchange: (inputCoin: string | number, outputCoin: string | number, amount: string, maxSlippage: number) => Promise<number>;
-        exchangeTricryptoApprove: (inputCoin: string | number, amount: string, useEth?: boolean) => Promise<number>;
-        exchangeTricrypto: (inputCoin: string | number, outputCoin: string | number, amount: string, maxSlippage: number, useEth?: boolean) => Promise<number>;
         exchangeWrappedApprove: (inputCoin: string | number, amount: string) => Promise<number>;
         exchangeWrapped: (inputCoin: string | number, outputCoin: string | number, amount: string, maxSlippage: number) => Promise<number>;
     };
@@ -112,11 +110,6 @@ export declare class Pool {
     exchangeApprove: (inputCoin: string | number, amount: string) => Promise<string[]>;
     private exchangeEstimateGas;
     exchange: (inputCoin: string | number, outputCoin: string | number, amount: string, maxSlippage?: number) => Promise<string>;
-    exchangeTricryptoIsApproved: (inputCoin: string | number, amount: string, useEth?: boolean) => Promise<boolean>;
-    private exchangeTricryptoApproveEstimateGas;
-    exchangeTricryptoApprove: (inputCoin: string | number, amount: string, useEth?: boolean) => Promise<string[]>;
-    private exchangeTricryptoEstimateGas;
-    exchangeTricrypto: (inputCoin: string | number, outputCoin: string | number, amount: string, maxSlippage?: number, useEth?: boolean) => Promise<string>;
     exchangeWrappedExpected: (inputCoin: string | number, outputCoin: string | number, amount: string) => Promise<string>;
     exchangeWrappedIsApproved: (inputCoin: string | number, amount: string) => Promise<boolean>;
     private exchangeWrappedApproveEstimateGas;
@@ -163,10 +156,6 @@ export declare class Pool {
     private _getExchangeOutput;
     private _getExchangeOutputWrapped;
 }
-export declare const _getBestPoolAndOutput: (inputCoinAddress: string, outputCoinAddress: string, inputCoinDecimals: number, amount: string) => Promise<{
-    poolAddress: string;
-    output: ethers.BigNumber;
-}>;
 export declare const getBestPoolAndOutput: (inputCoin: string, outputCoin: string, amount: string) => Promise<{
     poolAddress: string;
     output: string;