@defisaver/positions-sdk 0.0.100 → 0.0.102

package/README.md

@@ -1,63 +1,63 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)

package/cjs/markets/llamaLend/contractAddresses.js

@@ -9,11 +9,21 @@ const ethAddresses = {
         controllerAddress: '0x1E0165DbD2019441aB7927C018701f3138114D71',
         vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
     },
+    [types_1.LlamaLendVersions.LLWstethCrvusd2]: {
+        controllerId: 11,
+        controllerAddress: '0xB536FEa3a01c95Dd09932440eC802A75410139D6',
+        vaultAddress: '0x4a7999c55d3a93dAf72EA112985e57c2E3b9e95D',
+    },
     [types_1.LlamaLendVersions.LLSusdeCrvusd]: {
         controllerId: 7,
         controllerAddress: '0x98fc283d6636f6dcff5a817a00ac69a3add96907',
         vaultAddress: '0x52096539ed1391CB50C6b9e4Fd18aFd2438ED23b',
     },
+    [types_1.LlamaLendVersions.LLSusdeCrvusd2]: {
+        controllerId: 11,
+        controllerAddress: '0xB536FEa3a01c95Dd09932440eC802A75410139D6',
+        vaultAddress: '0x4a7999c55d3a93dAf72EA112985e57c2E3b9e95D',
+    },
     [types_1.LlamaLendVersions.LLCrvCrvusd]: {
         controllerId: 3,
         controllerAddress: '0xEdA215b7666936DEd834f76f3fBC6F323295110A',
@@ -44,6 +54,26 @@ const ethAddresses = {
         controllerAddress: '0xa5d9137d2a1ee912469d911a8e74b6c77503bac8',
         vaultAddress: '0x46196C004de85c7a75C8b1bB9d54Afb0f8654A45',
     },
+    [types_1.LlamaLendVersions.LLWethCrvusd2]: {
+        controllerId: 12,
+        controllerAddress: '0x23F5a668A9590130940eF55964ead9787976f2CC',
+        vaultAddress: '0x8fb1c7AEDcbBc1222325C39dd5c1D2d23420CAe3',
+    },
+    [types_1.LlamaLendVersions.LLWbtcCrvusd]: {
+        controllerId: 9,
+        controllerAddress: '0xcaD85b7fe52B1939DCEebEe9bCf0b2a5Aa0cE617',
+        vaultAddress: '0xccd37EB6374Ae5b1f0b85ac97eFf14770e0D0063',
+    },
+    [types_1.LlamaLendVersions.LLPufethCrvusd]: {
+        controllerId: 10,
+        controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
+        vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
+    },
+    [types_1.LlamaLendVersions.LLUsdeCrvusd]: {
+        controllerId: 14,
+        controllerAddress: '0x74f88Baa966407b50c10B393bBD789639EFfE78B',
+        vaultAddress: '0xc687141c18F20f7Ba405e45328825579fDdD3195',
+    },
 };
 const arbAddresses = {
     [types_1.LlamaLendVersions.LLArbCrvusd]: {
@@ -51,6 +81,11 @@ const arbAddresses = {
         controllerAddress: '0x76709bc0da299ab0234eec51385e900922ae98f5',
         vaultAddress: '0x65592b1F12c07D434e95c7BF87F4f2f464e950e4',
     },
+    [types_1.LlamaLendVersions.LLArbCrvusd2]: {
+        controllerId: 11,
+        controllerAddress: '0xeCF99dE21c31eC75b4Fb97e980F9d084b1d8Da8f',
+        vaultAddress: '0xa6C2E6A83D594e862cDB349396856f7FFE9a979B',
+    },
     [types_1.LlamaLendVersions.LLFxnCrvusd]: {
         controllerId: 7,
         controllerAddress: '0x7adcc491f0b7f9bc12837b8f5edf0e580d176f1f',
@@ -61,6 +96,11 @@ const arbAddresses = {
         controllerAddress: '0x013be86e1cdb0f384daf24bd974fe75edffe6b68',
         vaultAddress: '0x60D38b12d22BF423F28082bf396ff8F28cC506B1',
     },
+    [types_1.LlamaLendVersions.LLWbtcCrvusd2]: {
+        controllerId: 10,
+        controllerAddress: '0xb9aDddCf4e01c2f64F8F2CD9a050DC35585ea053',
+        vaultAddress: '0xe07f1151887b8FDC6800f737252f6b91b46b5865',
+    },
     [types_1.LlamaLendVersions.LLCrvCrvusd]: {
         controllerId: 4,
         controllerAddress: '0x88f88e937db48bbfe8e3091718576430704e47ab',
@@ -71,6 +111,11 @@ const arbAddresses = {
         controllerAddress: '0xb5b6f0e69c283aa32425fa18220e64283b51f0a4',
         vaultAddress: '0x49014A8eB1585cBee6A7a9A50C3b81017BF6Cc4d',
     },
+    [types_1.LlamaLendVersions.LLWethCrvusd2]: {
+        controllerId: 9,
+        controllerAddress: '0xB5c6082d3307088C98dA8D79991501E113e6365d',
+        vaultAddress: '0xd3cA9BEc3e681b0f578FD87f20eBCf2B7e0bb739',
+    },
 };
 const getLLamaLendAddresses = (networkId, version) => {
     let addresses;

package/cjs/markets/llamaLend/index.d.ts

@@ -1,16 +1,23 @@
 import { LlamaLendMarketData, LlamaLendVersionsType } from '../../types';
 import { NetworkNumber } from '../../types/common';
 export declare const LLAMALEND_WSTETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WSTETH_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_SUSDE_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_SUSDE_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRV_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRVUSD_CRV_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_TBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRVUSD_TBTC_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_WETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRVUSD_WETH_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WETH_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_ARB_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_ARB_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_FXN_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_WBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WBTC_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_USDE_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_PUFETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LlamaLendMarkets: (networkId: NetworkNumber) => Record<LlamaLendVersionsType, LlamaLendMarketData>;
 export declare const getLlamaLendMarketData: (market: LlamaLendVersionsType, network?: NetworkNumber) => LlamaLendMarketData;
 export declare const getLlamaLendMarketFromControllerAddress: (controllerAddress: string, network: NetworkNumber) => LlamaLendMarketData;

package/cjs/markets/llamaLend/index.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLlamaLendMarketFromControllerAddress = exports.getLlamaLendMarketData = exports.LlamaLendMarkets = exports.LLAMALEND_WBTC_CRVUSD_MARKET = exports.LLAMALEND_FXN_CRVUSD_MARKET = exports.LLAMALEND_ARB_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_WETH_MARKET = exports.LLAMALEND_WETH_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_TBTC_MARKET = exports.LLAMALEND_TBTC_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_CRV_MARKET = exports.LLAMALEND_CRV_CRVUSD_MARKET = exports.LLAMALEND_SUSDE_CRVUSD_MARKET = exports.LLAMALEND_WSTETH_CRVUSD_MARKET = void 0;
+exports.getLlamaLendMarketFromControllerAddress = exports.getLlamaLendMarketData = exports.LlamaLendMarkets = exports.LLAMALEND_PUFETH_CRVUSD_MARKET = exports.LLAMALEND_USDE_CRVUSD_MARKET = exports.LLAMALEND_WBTC_CRVUSD_MARKET_2 = exports.LLAMALEND_WBTC_CRVUSD_MARKET = exports.LLAMALEND_FXN_CRVUSD_MARKET = exports.LLAMALEND_ARB_CRVUSD_MARKET_2 = exports.LLAMALEND_ARB_CRVUSD_MARKET = exports.LLAMALEND_WETH_CRVUSD_MARKET_2 = exports.LLAMALEND_CRVUSD_WETH_MARKET = exports.LLAMALEND_WETH_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_TBTC_MARKET = exports.LLAMALEND_TBTC_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_CRV_MARKET = exports.LLAMALEND_CRV_CRVUSD_MARKET = exports.LLAMALEND_SUSDE_CRVUSD_MARKET_2 = exports.LLAMALEND_SUSDE_CRVUSD_MARKET = exports.LLAMALEND_WSTETH_CRVUSD_MARKET_2 = exports.LLAMALEND_WSTETH_CRVUSD_MARKET = void 0;
 const types_1 = require("../../types");
 const common_1 = require("../../types/common");
 const contractAddresses_1 = require("./contractAddresses");
 const LLAMALEND_WSTETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - wstETH/crvUSD', shortLabel: 'wstETH/crvUSD', value: types_1.LlamaLendVersions.LLWstethCrvusd, collAsset: 'wstETH', baseAsset: 'crvUSD', url: 'wstethcrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLWstethCrvusd)));
 exports.LLAMALEND_WSTETH_CRVUSD_MARKET = LLAMALEND_WSTETH_CRVUSD_MARKET;
+const LLAMALEND_WSTETH_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - wstETH/crvUSD #2', shortLabel: 'wstETH/crvUSD #2', value: types_1.LlamaLendVersions.LLWstethCrvusd2, collAsset: 'wstETH', baseAsset: 'crvUSD', url: 'wstethcrvusd2' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLWstethCrvusd2)));
+exports.LLAMALEND_WSTETH_CRVUSD_MARKET_2 = LLAMALEND_WSTETH_CRVUSD_MARKET_2;
 const LLAMALEND_SUSDE_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - sUSDe/crvUSD', shortLabel: 'sUSDe/crvUSD', value: types_1.LlamaLendVersions.LLSusdeCrvusd, collAsset: 'sUSDe', baseAsset: 'crvUSD', url: 'susdecrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLSusdeCrvusd)));
 exports.LLAMALEND_SUSDE_CRVUSD_MARKET = LLAMALEND_SUSDE_CRVUSD_MARKET;
+const LLAMALEND_SUSDE_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - sUSDe/crvUSD #2', shortLabel: 'sUSDe/crvUSD #2', value: types_1.LlamaLendVersions.LLSusdeCrvusd2, collAsset: 'sUSDe', baseAsset: 'crvUSD', url: 'susdecrvusd2' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLSusdeCrvusd2)));
+exports.LLAMALEND_SUSDE_CRVUSD_MARKET_2 = LLAMALEND_SUSDE_CRVUSD_MARKET_2;
 const LLAMALEND_CRV_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb], label: 'LlamaLend - CRV/crvUSD', shortLabel: 'CRV/crvUSD', value: types_1.LlamaLendVersions.LLCrvCrvusd, collAsset: 'CRV', baseAsset: 'crvUSD', url: 'crvcrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLCrvCrvusd)));
 exports.LLAMALEND_CRV_CRVUSD_MARKET = LLAMALEND_CRV_CRVUSD_MARKET;
 const LLAMALEND_CRVUSD_CRV_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - crvUSD/CRV', shortLabel: 'crvUSD/CRV', value: types_1.LlamaLendVersions.LLCrvusdCrv, collAsset: 'crvUSD', baseAsset: 'CRV', url: 'crvusdcrv' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLCrvusdCrv)));
@@ -20,24 +24,41 @@ const LLAMALEND_WETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [
 exports.LLAMALEND_WETH_CRVUSD_MARKET = LLAMALEND_WETH_CRVUSD_MARKET;
 const LLAMALEND_CRVUSD_WETH_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - crvUSD/ETH', shortLabel: 'crvUSD/ETH', value: types_1.LlamaLendVersions.LLCrvusdWeth, collAsset: 'crvUSD', baseAsset: 'ETH', url: 'crvusdweth' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLCrvusdWeth)));
 exports.LLAMALEND_CRVUSD_WETH_MARKET = LLAMALEND_CRVUSD_WETH_MARKET;
+const LLAMALEND_WETH_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb], label: 'LlamaLend - ETH/crvUSD #2', shortLabel: 'ETH/crvUSD #2', value: types_1.LlamaLendVersions.LLWethCrvusd2, collAsset: 'ETH', baseAsset: 'crvUSD', url: 'wethcrvusd2' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLWethCrvusd2)));
+exports.LLAMALEND_WETH_CRVUSD_MARKET_2 = LLAMALEND_WETH_CRVUSD_MARKET_2;
 const LLAMALEND_ARB_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Arb], label: 'LlamaLend - ARB/crvUSD', shortLabel: 'ARB/crvUSD', value: types_1.LlamaLendVersions.LLArbCrvusd, collAsset: 'ARB', baseAsset: 'crvUSD', url: 'arbcrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLArbCrvusd)));
 exports.LLAMALEND_ARB_CRVUSD_MARKET = LLAMALEND_ARB_CRVUSD_MARKET;
+const LLAMALEND_ARB_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Arb], label: 'LlamaLend - ARB/crvUSD #2', shortLabel: 'ARB/crvUSD #2', value: types_1.LlamaLendVersions.LLArbCrvusd2, collAsset: 'ARB', baseAsset: 'crvUSD', url: 'arbcrvusd2' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLArbCrvusd2)));
+exports.LLAMALEND_ARB_CRVUSD_MARKET_2 = LLAMALEND_ARB_CRVUSD_MARKET_2;
 const LLAMALEND_FXN_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Arb], label: 'LlamaLend - FXN/crvUSD', shortLabel: 'FXN/crvUSD', value: types_1.LlamaLendVersions.LLFxnCrvusd, collAsset: 'FXN', baseAsset: 'crvUSD', url: 'fxncrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLFxnCrvusd)));
 exports.LLAMALEND_FXN_CRVUSD_MARKET = LLAMALEND_FXN_CRVUSD_MARKET;
-const LLAMALEND_WBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD', shortLabel: 'WBTC/crvUSD', value: types_1.LlamaLendVersions.LLWbtcCrvusd, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLWbtcCrvusd)));
+const LLAMALEND_WBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD', shortLabel: 'WBTC/crvUSD', value: types_1.LlamaLendVersions.LLWbtcCrvusd, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLWbtcCrvusd)));
 exports.LLAMALEND_WBTC_CRVUSD_MARKET = LLAMALEND_WBTC_CRVUSD_MARKET;
+const LLAMALEND_WBTC_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD #2', shortLabel: 'WBTC/crvUSD #2', value: types_1.LlamaLendVersions.LLWbtcCrvusd2, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd2' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLWbtcCrvusd2)));
+exports.LLAMALEND_WBTC_CRVUSD_MARKET_2 = LLAMALEND_WBTC_CRVUSD_MARKET_2;
+const LLAMALEND_USDE_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - USDe/crvUSD', shortLabel: 'USDe/crvUSD', value: types_1.LlamaLendVersions.LLUsdeCrvusd, collAsset: 'USDe', baseAsset: 'crvUSD', url: 'usdecrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLUsdeCrvusd)));
+exports.LLAMALEND_USDE_CRVUSD_MARKET = LLAMALEND_USDE_CRVUSD_MARKET;
+const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - pufETH/crvUSD', shortLabel: 'pufETH/crvUSD', value: types_1.LlamaLendVersions.LLPufethCrvusd, collAsset: 'pufETH', baseAsset: 'crvUSD', url: 'pufethcrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLPufethCrvusd)));
+exports.LLAMALEND_PUFETH_CRVUSD_MARKET = LLAMALEND_PUFETH_CRVUSD_MARKET;
 const LlamaLendMarkets = (networkId) => ({
     [types_1.LlamaLendVersions.LLWstethCrvusd]: (0, exports.LLAMALEND_WSTETH_CRVUSD_MARKET)(networkId),
+    [types_1.LlamaLendVersions.LLWstethCrvusd2]: (0, exports.LLAMALEND_WSTETH_CRVUSD_MARKET_2)(networkId),
     [types_1.LlamaLendVersions.LLCrvusdCrv]: (0, exports.LLAMALEND_CRVUSD_CRV_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLCrvCrvusd]: (0, exports.LLAMALEND_CRV_CRVUSD_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLTbtcCrvusd]: (0, exports.LLAMALEND_TBTC_CRVUSD_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLCrvusdTbtc]: (0, exports.LLAMALEND_CRVUSD_TBTC_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLWethCrvusd]: (0, exports.LLAMALEND_WETH_CRVUSD_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLCrvusdWeth]: (0, exports.LLAMALEND_CRVUSD_WETH_MARKET)(networkId),
+    [types_1.LlamaLendVersions.LLWethCrvusd2]: (0, exports.LLAMALEND_WETH_CRVUSD_MARKET_2)(networkId),
     [types_1.LlamaLendVersions.LLArbCrvusd]: (0, exports.LLAMALEND_ARB_CRVUSD_MARKET)(networkId),
+    [types_1.LlamaLendVersions.LLArbCrvusd2]: (0, exports.LLAMALEND_ARB_CRVUSD_MARKET_2)(networkId),
     [types_1.LlamaLendVersions.LLFxnCrvusd]: (0, exports.LLAMALEND_FXN_CRVUSD_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLWbtcCrvusd]: (0, exports.LLAMALEND_WBTC_CRVUSD_MARKET)(networkId),
+    [types_1.LlamaLendVersions.LLWbtcCrvusd2]: (0, exports.LLAMALEND_WBTC_CRVUSD_MARKET_2)(networkId),
     [types_1.LlamaLendVersions.LLSusdeCrvusd]: (0, exports.LLAMALEND_SUSDE_CRVUSD_MARKET)(networkId),
+    [types_1.LlamaLendVersions.LLSusdeCrvusd2]: (0, exports.LLAMALEND_SUSDE_CRVUSD_MARKET_2)(networkId),
+    [types_1.LlamaLendVersions.LLUsdeCrvusd]: (0, exports.LLAMALEND_USDE_CRVUSD_MARKET)(networkId),
+    [types_1.LlamaLendVersions.LLPufethCrvusd]: (0, exports.LLAMALEND_PUFETH_CRVUSD_MARKET)(networkId),
 });
 exports.LlamaLendMarkets = LlamaLendMarkets;
 const getLlamaLendMarketData = (market, network = 1) => (0, exports.LlamaLendMarkets)(network)[market];

package/cjs/multicall/index.js

@@ -16,7 +16,7 @@ const multicall = (calls, web3, network = common_1.NetworkNumber.Eth, blockNumbe
     const multicallContract = (0, contracts_1.UniMulticallContract)(web3, network);
     const formattedCalls = calls.map((call) => {
         const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
-        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1e6 };
+        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1200000 };
     });
     const callResult = yield multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
     let formattedResult = [];

package/cjs/types/llamaLend.d.ts

@@ -2,7 +2,13 @@ import { EthAddress, NetworkNumber } from './common';
 import { BandData, UserBandData } from './curveUsd';
 export declare enum LLVersionsEth {
     LLWstethCrvusd = "llamaLendwstETHcrvUSD",
+    LLWstethCrvusd2 = "llamaLendwstETHcrvUSD2",
     LLSusdeCrvusd = "llamaLendsUSDecrvUSD",
+    LLSusdeCrvusd2 = "llamaLendsUSDecrvUSD2",
+    LLWbtcCrvusd = "llamaLendWBTCcrvUSD",
+    LLPufethCrvusd = "llamaLendPufETHcrvUSD",
+    LLUsdeCrvusd = "llamaLendUSDecrvUSD",
+    LLWethCrvusd2 = "llamaLendWETHcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
     LLCrvusdCrv = "llamaLendcrvUSDCRV",
     LLTbtcCrvusd = "llamaLendTBTCcrvUSD",
@@ -12,19 +18,30 @@ export declare enum LLVersionsEth {
 }
 export declare enum LLVersionsArb {
     LLArbCrvusd = "llamaLendArbcrvUSD",
+    LLArbCrvusd2 = "llamaLendArbcrvUSD2",
     LLFxnCrvusd = "llamaLendFXNcrvUSD",
     LLWbtcCrvusd = "llamaLendWBTCcrvUSD",
+    LLWbtcCrvusd2 = "llamaLendWBTCcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
-    LLWethCrvusd = "llamaLendWETHcrvUSD"
+    LLWethCrvusd = "llamaLendWETHcrvUSD",
+    LLWeth2Crvusd = "llamaLendWETHcrvUSD2"
 }
 export declare const LlamaLendVersions: {
     readonly LLArbCrvusd: LLVersionsArb.LLArbCrvusd;
+    readonly LLArbCrvusd2: LLVersionsArb.LLArbCrvusd2;
     readonly LLFxnCrvusd: LLVersionsArb.LLFxnCrvusd;
     readonly LLWbtcCrvusd: LLVersionsArb.LLWbtcCrvusd;
+    readonly LLWbtcCrvusd2: LLVersionsArb.LLWbtcCrvusd2;
     readonly LLCrvCrvusd: LLVersionsArb.LLCrvCrvusd;
     readonly LLWethCrvusd: LLVersionsArb.LLWethCrvusd;
+    readonly LLWeth2Crvusd: LLVersionsArb.LLWeth2Crvusd;
     readonly LLWstethCrvusd: LLVersionsEth.LLWstethCrvusd;
+    readonly LLWstethCrvusd2: LLVersionsEth.LLWstethCrvusd2;
     readonly LLSusdeCrvusd: LLVersionsEth.LLSusdeCrvusd;
+    readonly LLSusdeCrvusd2: LLVersionsEth.LLSusdeCrvusd2;
+    readonly LLPufethCrvusd: LLVersionsEth.LLPufethCrvusd;
+    readonly LLUsdeCrvusd: LLVersionsEth.LLUsdeCrvusd;
+    readonly LLWethCrvusd2: LLVersionsEth.LLWethCrvusd2;
     readonly LLCrvusdCrv: LLVersionsEth.LLCrvusdCrv;
     readonly LLTbtcCrvusd: LLVersionsEth.LLTbtcCrvusd;
     readonly LLCrvusdTbtc: LLVersionsEth.LLCrvusdTbtc;

package/cjs/types/llamaLend.js

@@ -5,7 +5,13 @@ var LLVersionsEth;
 (function (LLVersionsEth) {
     // long only
     LLVersionsEth["LLWstethCrvusd"] = "llamaLendwstETHcrvUSD";
+    LLVersionsEth["LLWstethCrvusd2"] = "llamaLendwstETHcrvUSD2";
     LLVersionsEth["LLSusdeCrvusd"] = "llamaLendsUSDecrvUSD";
+    LLVersionsEth["LLSusdeCrvusd2"] = "llamaLendsUSDecrvUSD2";
+    LLVersionsEth["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";
+    LLVersionsEth["LLPufethCrvusd"] = "llamaLendPufETHcrvUSD";
+    LLVersionsEth["LLUsdeCrvusd"] = "llamaLendUSDecrvUSD";
+    LLVersionsEth["LLWethCrvusd2"] = "llamaLendWETHcrvUSD2";
     // long and short crv
     LLVersionsEth["LLCrvCrvusd"] = "llamaLendCRVcrvUSD";
     LLVersionsEth["LLCrvusdCrv"] = "llamaLendcrvUSDCRV";
@@ -20,10 +26,13 @@ var LLVersionsArb;
 (function (LLVersionsArb) {
     // long only
     LLVersionsArb["LLArbCrvusd"] = "llamaLendArbcrvUSD";
+    LLVersionsArb["LLArbCrvusd2"] = "llamaLendArbcrvUSD2";
     LLVersionsArb["LLFxnCrvusd"] = "llamaLendFXNcrvUSD";
     LLVersionsArb["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";
+    LLVersionsArb["LLWbtcCrvusd2"] = "llamaLendWBTCcrvUSD2";
     LLVersionsArb["LLCrvCrvusd"] = "llamaLendCRVcrvUSD";
     LLVersionsArb["LLWethCrvusd"] = "llamaLendWETHcrvUSD";
+    LLVersionsArb["LLWeth2Crvusd"] = "llamaLendWETHcrvUSD2";
 })(LLVersionsArb || (exports.LLVersionsArb = LLVersionsArb = {}));
 exports.LlamaLendVersions = Object.assign(Object.assign({}, LLVersionsEth), LLVersionsArb);
 var LlamaLendStatus;

package/esm/markets/llamaLend/contractAddresses.js

@@ -6,11 +6,21 @@ const ethAddresses = {
         controllerAddress: '0x1E0165DbD2019441aB7927C018701f3138114D71',
         vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
     },
+    [LlamaLendVersions.LLWstethCrvusd2]: {
+        controllerId: 11,
+        controllerAddress: '0xB536FEa3a01c95Dd09932440eC802A75410139D6',
+        vaultAddress: '0x4a7999c55d3a93dAf72EA112985e57c2E3b9e95D',
+    },
     [LlamaLendVersions.LLSusdeCrvusd]: {
         controllerId: 7,
         controllerAddress: '0x98fc283d6636f6dcff5a817a00ac69a3add96907',
         vaultAddress: '0x52096539ed1391CB50C6b9e4Fd18aFd2438ED23b',
     },
+    [LlamaLendVersions.LLSusdeCrvusd2]: {
+        controllerId: 11,
+        controllerAddress: '0xB536FEa3a01c95Dd09932440eC802A75410139D6',
+        vaultAddress: '0x4a7999c55d3a93dAf72EA112985e57c2E3b9e95D',
+    },
     [LlamaLendVersions.LLCrvCrvusd]: {
         controllerId: 3,
         controllerAddress: '0xEdA215b7666936DEd834f76f3fBC6F323295110A',
@@ -41,6 +51,26 @@ const ethAddresses = {
         controllerAddress: '0xa5d9137d2a1ee912469d911a8e74b6c77503bac8',
         vaultAddress: '0x46196C004de85c7a75C8b1bB9d54Afb0f8654A45',
     },
+    [LlamaLendVersions.LLWethCrvusd2]: {
+        controllerId: 12,
+        controllerAddress: '0x23F5a668A9590130940eF55964ead9787976f2CC',
+        vaultAddress: '0x8fb1c7AEDcbBc1222325C39dd5c1D2d23420CAe3',
+    },
+    [LlamaLendVersions.LLWbtcCrvusd]: {
+        controllerId: 9,
+        controllerAddress: '0xcaD85b7fe52B1939DCEebEe9bCf0b2a5Aa0cE617',
+        vaultAddress: '0xccd37EB6374Ae5b1f0b85ac97eFf14770e0D0063',
+    },
+    [LlamaLendVersions.LLPufethCrvusd]: {
+        controllerId: 10,
+        controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
+        vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
+    },
+    [LlamaLendVersions.LLUsdeCrvusd]: {
+        controllerId: 14,
+        controllerAddress: '0x74f88Baa966407b50c10B393bBD789639EFfE78B',
+        vaultAddress: '0xc687141c18F20f7Ba405e45328825579fDdD3195',
+    },
 };
 const arbAddresses = {
     [LlamaLendVersions.LLArbCrvusd]: {
@@ -48,6 +78,11 @@ const arbAddresses = {
         controllerAddress: '0x76709bc0da299ab0234eec51385e900922ae98f5',
         vaultAddress: '0x65592b1F12c07D434e95c7BF87F4f2f464e950e4',
     },
+    [LlamaLendVersions.LLArbCrvusd2]: {
+        controllerId: 11,
+        controllerAddress: '0xeCF99dE21c31eC75b4Fb97e980F9d084b1d8Da8f',
+        vaultAddress: '0xa6C2E6A83D594e862cDB349396856f7FFE9a979B',
+    },
     [LlamaLendVersions.LLFxnCrvusd]: {
         controllerId: 7,
         controllerAddress: '0x7adcc491f0b7f9bc12837b8f5edf0e580d176f1f',
@@ -58,6 +93,11 @@ const arbAddresses = {
         controllerAddress: '0x013be86e1cdb0f384daf24bd974fe75edffe6b68',
         vaultAddress: '0x60D38b12d22BF423F28082bf396ff8F28cC506B1',
     },
+    [LlamaLendVersions.LLWbtcCrvusd2]: {
+        controllerId: 10,
+        controllerAddress: '0xb9aDddCf4e01c2f64F8F2CD9a050DC35585ea053',
+        vaultAddress: '0xe07f1151887b8FDC6800f737252f6b91b46b5865',
+    },
     [LlamaLendVersions.LLCrvCrvusd]: {
         controllerId: 4,
         controllerAddress: '0x88f88e937db48bbfe8e3091718576430704e47ab',
@@ -68,6 +108,11 @@ const arbAddresses = {
         controllerAddress: '0xb5b6f0e69c283aa32425fa18220e64283b51f0a4',
         vaultAddress: '0x49014A8eB1585cBee6A7a9A50C3b81017BF6Cc4d',
     },
+    [LlamaLendVersions.LLWethCrvusd2]: {
+        controllerId: 9,
+        controllerAddress: '0xB5c6082d3307088C98dA8D79991501E113e6365d',
+        vaultAddress: '0xd3cA9BEc3e681b0f578FD87f20eBCf2B7e0bb739',
+    },
 };
 export const getLLamaLendAddresses = (networkId, version) => {
     let addresses;

package/esm/markets/llamaLend/index.d.ts

@@ -1,16 +1,23 @@
 import { LlamaLendMarketData, LlamaLendVersionsType } from '../../types';
 import { NetworkNumber } from '../../types/common';
 export declare const LLAMALEND_WSTETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WSTETH_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_SUSDE_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_SUSDE_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRV_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRVUSD_CRV_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_TBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRVUSD_TBTC_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_WETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRVUSD_WETH_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WETH_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_ARB_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_ARB_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_FXN_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_WBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WBTC_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_USDE_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_PUFETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LlamaLendMarkets: (networkId: NetworkNumber) => Record<LlamaLendVersionsType, LlamaLendMarketData>;
 export declare const getLlamaLendMarketData: (market: LlamaLendVersionsType, network?: NetworkNumber) => LlamaLendMarketData;
 export declare const getLlamaLendMarketFromControllerAddress: (controllerAddress: string, network: NetworkNumber) => LlamaLendMarketData;

package/esm/markets/llamaLend/index.js

@@ -2,28 +2,42 @@ import { LlamaLendVersions } from '../../types';
 import { NetworkNumber } from '../../types/common';
 import { getLLamaLendAddresses } from './contractAddresses';
 export const LLAMALEND_WSTETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - wstETH/crvUSD', shortLabel: 'wstETH/crvUSD', value: LlamaLendVersions.LLWstethCrvusd, collAsset: 'wstETH', baseAsset: 'crvUSD', url: 'wstethcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWstethCrvusd)));
+export const LLAMALEND_WSTETH_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - wstETH/crvUSD #2', shortLabel: 'wstETH/crvUSD #2', value: LlamaLendVersions.LLWstethCrvusd2, collAsset: 'wstETH', baseAsset: 'crvUSD', url: 'wstethcrvusd2' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWstethCrvusd2)));
 export const LLAMALEND_SUSDE_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - sUSDe/crvUSD', shortLabel: 'sUSDe/crvUSD', value: LlamaLendVersions.LLSusdeCrvusd, collAsset: 'sUSDe', baseAsset: 'crvUSD', url: 'susdecrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLSusdeCrvusd)));
+export const LLAMALEND_SUSDE_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - sUSDe/crvUSD #2', shortLabel: 'sUSDe/crvUSD #2', value: LlamaLendVersions.LLSusdeCrvusd2, collAsset: 'sUSDe', baseAsset: 'crvUSD', url: 'susdecrvusd2' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLSusdeCrvusd2)));
 export const LLAMALEND_CRV_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth, NetworkNumber.Arb], label: 'LlamaLend - CRV/crvUSD', shortLabel: 'CRV/crvUSD', value: LlamaLendVersions.LLCrvCrvusd, collAsset: 'CRV', baseAsset: 'crvUSD', url: 'crvcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvCrvusd)));
 export const LLAMALEND_CRVUSD_CRV_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - crvUSD/CRV', shortLabel: 'crvUSD/CRV', value: LlamaLendVersions.LLCrvusdCrv, collAsset: 'crvUSD', baseAsset: 'CRV', url: 'crvusdcrv' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdCrv)));
 export const LLAMALEND_TBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - tBTC/crvUSD', shortLabel: 'tBTC/crvUSD', value: LlamaLendVersions.LLTbtcCrvusd, collAsset: 'tBTC', baseAsset: 'crvUSD', url: 'tbtccrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLTbtcCrvusd)));
 export const LLAMALEND_CRVUSD_TBTC_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - crvUSD/tBTC', shortLabel: 'crvUSD/tBTC', value: LlamaLendVersions.LLCrvusdTbtc, collAsset: 'crvUSD', baseAsset: 'tBTC', url: 'crvusdtbtc' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdTbtc)));
 export const LLAMALEND_WETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth, NetworkNumber.Arb], label: 'LlamaLend - ETH/crvUSD', shortLabel: 'ETH/crvUSD', value: LlamaLendVersions.LLWethCrvusd, collAsset: 'ETH', baseAsset: 'crvUSD', url: 'wethcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWethCrvusd)));
 export const LLAMALEND_CRVUSD_WETH_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - crvUSD/ETH', shortLabel: 'crvUSD/ETH', value: LlamaLendVersions.LLCrvusdWeth, collAsset: 'crvUSD', baseAsset: 'ETH', url: 'crvusdweth' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdWeth)));
+export const LLAMALEND_WETH_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth, NetworkNumber.Arb], label: 'LlamaLend - ETH/crvUSD #2', shortLabel: 'ETH/crvUSD #2', value: LlamaLendVersions.LLWethCrvusd2, collAsset: 'ETH', baseAsset: 'crvUSD', url: 'wethcrvusd2' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWethCrvusd2)));
 export const LLAMALEND_ARB_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - ARB/crvUSD', shortLabel: 'ARB/crvUSD', value: LlamaLendVersions.LLArbCrvusd, collAsset: 'ARB', baseAsset: 'crvUSD', url: 'arbcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLArbCrvusd)));
+export const LLAMALEND_ARB_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - ARB/crvUSD #2', shortLabel: 'ARB/crvUSD #2', value: LlamaLendVersions.LLArbCrvusd2, collAsset: 'ARB', baseAsset: 'crvUSD', url: 'arbcrvusd2' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLArbCrvusd2)));
 export const LLAMALEND_FXN_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - FXN/crvUSD', shortLabel: 'FXN/crvUSD', value: LlamaLendVersions.LLFxnCrvusd, collAsset: 'FXN', baseAsset: 'crvUSD', url: 'fxncrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLFxnCrvusd)));
-export const LLAMALEND_WBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD', shortLabel: 'WBTC/crvUSD', value: LlamaLendVersions.LLWbtcCrvusd, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWbtcCrvusd)));
+export const LLAMALEND_WBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth, NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD', shortLabel: 'WBTC/crvUSD', value: LlamaLendVersions.LLWbtcCrvusd, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWbtcCrvusd)));
+export const LLAMALEND_WBTC_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD #2', shortLabel: 'WBTC/crvUSD #2', value: LlamaLendVersions.LLWbtcCrvusd2, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd2' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWbtcCrvusd2)));
+export const LLAMALEND_USDE_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - USDe/crvUSD', shortLabel: 'USDe/crvUSD', value: LlamaLendVersions.LLUsdeCrvusd, collAsset: 'USDe', baseAsset: 'crvUSD', url: 'usdecrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLUsdeCrvusd)));
+export const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - pufETH/crvUSD', shortLabel: 'pufETH/crvUSD', value: LlamaLendVersions.LLPufethCrvusd, collAsset: 'pufETH', baseAsset: 'crvUSD', url: 'pufethcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLPufethCrvusd)));
 export const LlamaLendMarkets = (networkId) => ({
     [LlamaLendVersions.LLWstethCrvusd]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLWstethCrvusd2]: LLAMALEND_WSTETH_CRVUSD_MARKET_2(networkId),
     [LlamaLendVersions.LLCrvusdCrv]: LLAMALEND_CRVUSD_CRV_MARKET(networkId),
     [LlamaLendVersions.LLCrvCrvusd]: LLAMALEND_CRV_CRVUSD_MARKET(networkId),
     [LlamaLendVersions.LLTbtcCrvusd]: LLAMALEND_TBTC_CRVUSD_MARKET(networkId),
     [LlamaLendVersions.LLCrvusdTbtc]: LLAMALEND_CRVUSD_TBTC_MARKET(networkId),
     [LlamaLendVersions.LLWethCrvusd]: LLAMALEND_WETH_CRVUSD_MARKET(networkId),
     [LlamaLendVersions.LLCrvusdWeth]: LLAMALEND_CRVUSD_WETH_MARKET(networkId),
+    [LlamaLendVersions.LLWethCrvusd2]: LLAMALEND_WETH_CRVUSD_MARKET_2(networkId),
     [LlamaLendVersions.LLArbCrvusd]: LLAMALEND_ARB_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLArbCrvusd2]: LLAMALEND_ARB_CRVUSD_MARKET_2(networkId),
     [LlamaLendVersions.LLFxnCrvusd]: LLAMALEND_FXN_CRVUSD_MARKET(networkId),
     [LlamaLendVersions.LLWbtcCrvusd]: LLAMALEND_WBTC_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLWbtcCrvusd2]: LLAMALEND_WBTC_CRVUSD_MARKET_2(networkId),
     [LlamaLendVersions.LLSusdeCrvusd]: LLAMALEND_SUSDE_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLSusdeCrvusd2]: LLAMALEND_SUSDE_CRVUSD_MARKET_2(networkId),
+    [LlamaLendVersions.LLUsdeCrvusd]: LLAMALEND_USDE_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLPufethCrvusd]: LLAMALEND_PUFETH_CRVUSD_MARKET(networkId),
 });
 export const getLlamaLendMarketData = (market, network = 1) => LlamaLendMarkets(network)[market];
 export const getLlamaLendMarketFromControllerAddress = (controllerAddress, network) => {

package/esm/multicall/index.js

@@ -13,7 +13,7 @@ export const multicall = (calls, web3, network = NetworkNumber.Eth, blockNumber
     const multicallContract = UniMulticallContract(web3, network);
     const formattedCalls = calls.map((call) => {
         const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
-        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1e6 };
+        return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1200000 };
     });
     const callResult = yield multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
     let formattedResult = [];

package/esm/types/llamaLend.d.ts

@@ -2,7 +2,13 @@ import { EthAddress, NetworkNumber } from './common';
 import { BandData, UserBandData } from './curveUsd';
 export declare enum LLVersionsEth {
     LLWstethCrvusd = "llamaLendwstETHcrvUSD",
+    LLWstethCrvusd2 = "llamaLendwstETHcrvUSD2",
     LLSusdeCrvusd = "llamaLendsUSDecrvUSD",
+    LLSusdeCrvusd2 = "llamaLendsUSDecrvUSD2",
+    LLWbtcCrvusd = "llamaLendWBTCcrvUSD",
+    LLPufethCrvusd = "llamaLendPufETHcrvUSD",
+    LLUsdeCrvusd = "llamaLendUSDecrvUSD",
+    LLWethCrvusd2 = "llamaLendWETHcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
     LLCrvusdCrv = "llamaLendcrvUSDCRV",
     LLTbtcCrvusd = "llamaLendTBTCcrvUSD",
@@ -12,19 +18,30 @@ export declare enum LLVersionsEth {
 }
 export declare enum LLVersionsArb {
     LLArbCrvusd = "llamaLendArbcrvUSD",
+    LLArbCrvusd2 = "llamaLendArbcrvUSD2",
     LLFxnCrvusd = "llamaLendFXNcrvUSD",
     LLWbtcCrvusd = "llamaLendWBTCcrvUSD",
+    LLWbtcCrvusd2 = "llamaLendWBTCcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
-    LLWethCrvusd = "llamaLendWETHcrvUSD"
+    LLWethCrvusd = "llamaLendWETHcrvUSD",
+    LLWeth2Crvusd = "llamaLendWETHcrvUSD2"
 }
 export declare const LlamaLendVersions: {
     readonly LLArbCrvusd: LLVersionsArb.LLArbCrvusd;
+    readonly LLArbCrvusd2: LLVersionsArb.LLArbCrvusd2;
     readonly LLFxnCrvusd: LLVersionsArb.LLFxnCrvusd;
     readonly LLWbtcCrvusd: LLVersionsArb.LLWbtcCrvusd;
+    readonly LLWbtcCrvusd2: LLVersionsArb.LLWbtcCrvusd2;
     readonly LLCrvCrvusd: LLVersionsArb.LLCrvCrvusd;
     readonly LLWethCrvusd: LLVersionsArb.LLWethCrvusd;
+    readonly LLWeth2Crvusd: LLVersionsArb.LLWeth2Crvusd;
     readonly LLWstethCrvusd: LLVersionsEth.LLWstethCrvusd;
+    readonly LLWstethCrvusd2: LLVersionsEth.LLWstethCrvusd2;
     readonly LLSusdeCrvusd: LLVersionsEth.LLSusdeCrvusd;
+    readonly LLSusdeCrvusd2: LLVersionsEth.LLSusdeCrvusd2;
+    readonly LLPufethCrvusd: LLVersionsEth.LLPufethCrvusd;
+    readonly LLUsdeCrvusd: LLVersionsEth.LLUsdeCrvusd;
+    readonly LLWethCrvusd2: LLVersionsEth.LLWethCrvusd2;
     readonly LLCrvusdCrv: LLVersionsEth.LLCrvusdCrv;
     readonly LLTbtcCrvusd: LLVersionsEth.LLTbtcCrvusd;
     readonly LLCrvusdTbtc: LLVersionsEth.LLCrvusdTbtc;