@defisaver/positions-sdk 0.0.64 → 0.0.66

package/.yarnrc.yml

@@ -0,0 +1 @@
+yarnPath: .yarn/releases/yarn-1.22.1.cjs

package/cjs/aaveV3/index.js

@@ -175,7 +175,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
-            if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
+            if (staking_1.STAKING_ASSETS.includes(_market.symbol)) {
                 _market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(_market.symbol, defaultWeb3);
                 _market.incentiveSupplyToken = _market.symbol;
             }

package/cjs/config/contracts.d.ts

@@ -1126,6 +1126,9 @@ export namespace cUSDCv3 {
         "1": {
             address: string;
         };
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };
@@ -1495,6 +1498,9 @@ export namespace CompV3View {
                 };
             };
         };
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };
@@ -1688,6 +1694,9 @@ export namespace CompV3BulkerL2 {
     })[];
     export { abi_20 as abi };
     let networks_20: {
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };

package/cjs/config/contracts.js

@@ -246,6 +246,9 @@ module.exports = {
             "1": {
                 "address": "0xc3d688B66703497DAA19211EEdff47f25384cdc3"
             },
+            "10": {
+                "address": "0x2e44e174f7D53F0212823acC11C01A11d58c5bCB"
+            },
             "8453": {
                 "address": "0xb125E6687d4313864e53df431d5425969c15Eb2F"
             },
@@ -294,6 +297,9 @@ module.exports = {
                     }
                 }
             },
+            "10": {
+                "address": "0x969d845618596787DBc64687Ee90b16931BBBCBC"
+            },
             "8453": {
                 "address": "0x22591183c0eb7B2Fe07F6F44fd360d1117D07b4f"
             },
@@ -321,6 +327,9 @@ module.exports = {
     "CompV3BulkerL2": {
         "abi": [{ "inputs": [{ "internalType": "address", "name": "admin_", "type": "address" }, { "internalType": "address payable", "name": "wrappedNativeToken_", "type": "address" }], "stateMutability": "nonpayable", "type": "constructor" }, { "inputs": [], "name": "FailedToSendNativeToken", "type": "error" }, { "inputs": [], "name": "InvalidAddress", "type": "error" }, { "inputs": [], "name": "InvalidArgument", "type": "error" }, { "inputs": [], "name": "TransferInFailed", "type": "error" }, { "inputs": [], "name": "TransferOutFailed", "type": "error" }, { "inputs": [], "name": "Unauthorized", "type": "error" }, { "inputs": [], "name": "UnhandledAction", "type": "error" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "oldAdmin", "type": "address" }, { "indexed": true, "internalType": "address", "name": "newAdmin", "type": "address" }], "name": "AdminTransferred", "type": "event" }, { "inputs": [], "name": "ACTION_CLAIM_REWARD", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_SUPPLY_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_SUPPLY_NATIVE_TOKEN", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_TRANSFER_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_WITHDRAW_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_WITHDRAW_NATIVE_TOKEN", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "admin", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32[]", "name": "actions", "type": "bytes32[]" }, { "internalType": "bytes[]", "name": "data", "type": "bytes[]" }], "name": "invoke", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "recipient", "type": "address" }], "name": "sweepNativeToken", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "recipient", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }], "name": "sweepToken", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "newAdmin", "type": "address" }], "name": "transferAdmin", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "wrappedNativeToken", "outputs": [{ "internalType": "address payable", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "stateMutability": "payable", "type": "receive" }],
         "networks": {
+            "10": {
+                "address": "0xcb3643CC8294B23171272845473dEc49739d4Ba3"
+            },
             "8453": {
                 "address": "0x78D0677032A35c63D142a48A2037048871212a8C"
             },

package/cjs/markets/compound/index.js

@@ -36,10 +36,11 @@ const BULKER_OPTIONS = {
         [types_1.CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     },
     [common_1.NetworkNumber.Opt]: {
+        [types_1.CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
+        // Non-existing markets, keeping it because of typescript
         [types_1.CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
         [types_1.CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
         [types_1.CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
-        [types_1.CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
         [types_1.CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     },
 };
@@ -59,7 +60,7 @@ exports.COMPOUND_V2 = {
     // icon: SvgAdapter(protocolIcons.compound),
 };
 const COMPOUND_V3_USDC = (networkId) => ({
-    chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base],
+    chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Opt],
     label: 'Compound V3 - USDC',
     shortLabel: 'v3',
     value: types_1.CompoundVersions.CompoundV3USDC,

package/cjs/markets/compound/marketsAssets.d.ts

@@ -2,9 +2,10 @@ export declare const compoundV2CollateralAssets: import("@defisaver/tokens/esm/t
 export declare const v3USDCCollAssetsEth: string[];
 export declare const v3USDCCollAssetsArb: string[];
 export declare const v3USDCCollAssetsBase: string[];
+export declare const v3USDCCollAssetsOpt: string[];
 export declare const v3USDCCollAssets: {
     readonly 1: string[];
-    readonly 10: readonly [];
+    readonly 10: string[];
     readonly 42161: string[];
     readonly 8453: string[];
 };

package/cjs/markets/compound/marketsAssets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsBase = exports.v3ETHCollAssetsEth = exports.v3USDCeCollAssets = exports.v3USDCeCollAssetsArb = exports.v3USDCCollAssets = exports.v3USDCCollAssetsBase = exports.v3USDCCollAssetsArb = exports.v3USDCCollAssetsEth = exports.compoundV2CollateralAssets = void 0;
+exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsBase = exports.v3ETHCollAssetsEth = exports.v3USDCeCollAssets = exports.v3USDCeCollAssetsArb = exports.v3USDCCollAssets = exports.v3USDCCollAssetsOpt = exports.v3USDCCollAssetsBase = exports.v3USDCCollAssetsArb = exports.v3USDCCollAssetsEth = exports.compoundV2CollateralAssets = void 0;
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../../types/common");
 exports.compoundV2CollateralAssets = [
@@ -10,10 +10,11 @@ exports.compoundV2CollateralAssets = [
 exports.v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
 exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
 exports.v3USDCCollAssetsBase = ['ETH', 'cbETH'];
+exports.v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3USDCCollAssets = {
     [common_1.NetworkNumber.Eth]: exports.v3USDCCollAssetsEth,
-    [common_1.NetworkNumber.Opt]: [],
+    [common_1.NetworkNumber.Opt]: exports.v3USDCCollAssetsOpt,
     [common_1.NetworkNumber.Arb]: exports.v3USDCCollAssetsArb,
     [common_1.NetworkNumber.Base]: exports.v3USDCCollAssetsBase,
 };

package/cjs/morphoBlue/index.js

@@ -102,7 +102,7 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             canBeSupplied: true,
             canBeBorrowed: false,
         };
-        if (['wstETH', 'cbETH', 'rETH', 'sUSDe'].includes(collateralTokenInfo.symbol)) {
+        if (staking_1.STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
             assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralTokenInfo.symbol, mainnetWeb3);
             assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
         }

package/cjs/staking/staking.d.ts

@@ -5,7 +5,8 @@ export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number)
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getSUSDeApy: () => Promise<any>;
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | undefined;
+export declare const STAKING_ASSETS: string[];
+export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean) => {
     netApy: string;

package/cjs/staking/staking.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.getSUSDeApy = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
+exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = exports.getSUSDeApy = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
@@ -92,17 +92,32 @@ const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* () {
     return data.apy;
 });
 exports.getSUSDeApy = getSUSDeApy;
+const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch('https://www.etherfi.bid/api/etherfi/apr');
+    const data = yield res.json();
+    const total = data.latest_aprs.reduce((acc, apr) => new decimal_js_1.default(acc).add(apr).toString());
+    return new decimal_js_1.default(total).div(data.latest_aprs.length).div(100).toString();
+});
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH'];
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
-    if (asset === 'stETH' || asset === 'wstETH')
-        return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
-    if (asset === 'cbETH')
-        return (0, exports.getCbETHApr)(web3, blockNumber);
-    if (asset === 'rETH')
-        return (0, exports.getREthApr)(web3, blockNumber);
-    if (asset === 'sDAI')
-        return (0, exports.getDsrApy)(web3);
-    if (asset === 'sUSDe')
-        return (0, exports.getSUSDeApy)();
+    try {
+        if (asset === 'stETH' || asset === 'wstETH')
+            return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
+        if (asset === 'cbETH')
+            return (0, exports.getCbETHApr)(web3, blockNumber);
+        if (asset === 'rETH')
+            return (0, exports.getREthApr)(web3, blockNumber);
+        if (asset === 'sDAI')
+            return (0, exports.getDsrApy)(web3);
+        if (asset === 'sUSDe')
+            return (0, exports.getSUSDeApy)();
+        if (asset === 'weETH')
+            return getWeEthApr();
+    }
+    catch (e) {
+        console.error(`Failed to fetch APY for ${asset}`);
+        return '0';
+    }
 };
 exports.getStakingApy = getStakingApy;
 const calculateInterestEarned = (principal, interest, type, apy = false) => {

package/esm/aaveV3/index.js

@@ -12,7 +12,7 @@ import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tok
 import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
 import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { NetworkNumber, } from '../types/common';
-import { getStakingApy } from '../staking';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { multicall } from '../multicall';
 import { getAssetsBalances } from '../assets';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
@@ -166,7 +166,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
-            if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
+            if (STAKING_ASSETS.includes(_market.symbol)) {
                 _market.incentiveSupplyApy = yield getStakingApy(_market.symbol, defaultWeb3);
                 _market.incentiveSupplyToken = _market.symbol;
             }

package/esm/config/contracts.d.ts

@@ -1126,6 +1126,9 @@ export namespace cUSDCv3 {
         "1": {
             address: string;
         };
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };
@@ -1495,6 +1498,9 @@ export namespace CompV3View {
                 };
             };
         };
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };
@@ -1688,6 +1694,9 @@ export namespace CompV3BulkerL2 {
     })[];
     export { abi_20 as abi };
     let networks_20: {
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };

package/esm/config/contracts.js

@@ -245,6 +245,9 @@ module.exports = {
             "1": {
                 "address": "0xc3d688B66703497DAA19211EEdff47f25384cdc3"
             },
+            "10": {
+                "address": "0x2e44e174f7D53F0212823acC11C01A11d58c5bCB"
+            },
             "8453": {
                 "address": "0xb125E6687d4313864e53df431d5425969c15Eb2F"
             },
@@ -293,6 +296,9 @@ module.exports = {
                     }
                 }
             },
+            "10": {
+                "address": "0x969d845618596787DBc64687Ee90b16931BBBCBC"
+            },
             "8453": {
                 "address": "0x22591183c0eb7B2Fe07F6F44fd360d1117D07b4f"
             },
@@ -320,6 +326,9 @@ module.exports = {
     "CompV3BulkerL2": {
         "abi": [{ "inputs": [{ "internalType": "address", "name": "admin_", "type": "address" }, { "internalType": "address payable", "name": "wrappedNativeToken_", "type": "address" }], "stateMutability": "nonpayable", "type": "constructor" }, { "inputs": [], "name": "FailedToSendNativeToken", "type": "error" }, { "inputs": [], "name": "InvalidAddress", "type": "error" }, { "inputs": [], "name": "InvalidArgument", "type": "error" }, { "inputs": [], "name": "TransferInFailed", "type": "error" }, { "inputs": [], "name": "TransferOutFailed", "type": "error" }, { "inputs": [], "name": "Unauthorized", "type": "error" }, { "inputs": [], "name": "UnhandledAction", "type": "error" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "oldAdmin", "type": "address" }, { "indexed": true, "internalType": "address", "name": "newAdmin", "type": "address" }], "name": "AdminTransferred", "type": "event" }, { "inputs": [], "name": "ACTION_CLAIM_REWARD", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_SUPPLY_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_SUPPLY_NATIVE_TOKEN", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_TRANSFER_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_WITHDRAW_ASSET", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "ACTION_WITHDRAW_NATIVE_TOKEN", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "admin", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32[]", "name": "actions", "type": "bytes32[]" }, { "internalType": "bytes[]", "name": "data", "type": "bytes[]" }], "name": "invoke", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "recipient", "type": "address" }], "name": "sweepNativeToken", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "recipient", "type": "address" }, { "internalType": "address", "name": "asset", "type": "address" }], "name": "sweepToken", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "newAdmin", "type": "address" }], "name": "transferAdmin", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "wrappedNativeToken", "outputs": [{ "internalType": "address payable", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "stateMutability": "payable", "type": "receive" }],
         "networks": {
+            "10": {
+                "address": "0xcb3643CC8294B23171272845473dEc49739d4Ba3"
+            },
             "8453": {
                 "address": "0x78D0677032A35c63D142a48A2037048871212a8C"
             },

package/esm/markets/compound/index.js

@@ -33,10 +33,11 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     },
     [NetworkNumber.Opt]: {
+        [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
+        // Non-existing markets, keeping it because of typescript
         [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
-        [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     },
 };
@@ -56,7 +57,7 @@ export const COMPOUND_V2 = {
     // icon: SvgAdapter(protocolIcons.compound),
 };
 export const COMPOUND_V3_USDC = (networkId) => ({
-    chainIds: [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base],
+    chainIds: [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Opt],
     label: 'Compound V3 - USDC',
     shortLabel: 'v3',
     value: CompoundVersions.CompoundV3USDC,

package/esm/markets/compound/marketsAssets.d.ts

@@ -2,9 +2,10 @@ export declare const compoundV2CollateralAssets: import("@defisaver/tokens/esm/t
 export declare const v3USDCCollAssetsEth: string[];
 export declare const v3USDCCollAssetsArb: string[];
 export declare const v3USDCCollAssetsBase: string[];
+export declare const v3USDCCollAssetsOpt: string[];
 export declare const v3USDCCollAssets: {
     readonly 1: string[];
-    readonly 10: readonly [];
+    readonly 10: string[];
     readonly 42161: string[];
     readonly 8453: string[];
 };

package/esm/markets/compound/marketsAssets.js

@@ -7,10 +7,11 @@ export const compoundV2CollateralAssets = [
 export const v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
 export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
 export const v3USDCCollAssetsBase = ['ETH', 'cbETH'];
+export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const v3USDCCollAssets = {
     [NetworkNumber.Eth]: v3USDCCollAssetsEth,
-    [NetworkNumber.Opt]: [],
+    [NetworkNumber.Opt]: v3USDCCollAssetsOpt,
     [NetworkNumber.Arb]: v3USDCCollAssetsArb,
     [NetworkNumber.Base]: v3USDCCollAssetsBase,
 };

package/esm/morphoBlue/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { MorphoBlueViewContract, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
 import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
-import { getStakingApy } from '../staking';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getAbiItem, wethToEth } from '../services/utils';
 import { multicall } from '../multicall';
 import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
@@ -96,7 +96,7 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             canBeSupplied: true,
             canBeBorrowed: false,
         };
-        if (['wstETH', 'cbETH', 'rETH', 'sUSDe'].includes(collateralTokenInfo.symbol)) {
+        if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
             assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
             assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
         }

package/esm/staking/staking.d.ts

@@ -5,7 +5,8 @@ export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number)
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getSUSDeApy: () => Promise<any>;
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | undefined;
+export declare const STAKING_ASSETS: string[];
+export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean) => {
     netApy: string;

package/esm/staking/staking.js

@@ -81,17 +81,32 @@ export const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* ()
     const data = yield res.json();
     return data.apy;
 });
+const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch('https://www.etherfi.bid/api/etherfi/apr');
+    const data = yield res.json();
+    const total = data.latest_aprs.reduce((acc, apr) => new Dec(acc).add(apr).toString());
+    return new Dec(total).div(data.latest_aprs.length).div(100).toString();
+});
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
-    if (asset === 'stETH' || asset === 'wstETH')
-        return getStETHApr(web3, fromBlock, blockNumber);
-    if (asset === 'cbETH')
-        return getCbETHApr(web3, blockNumber);
-    if (asset === 'rETH')
-        return getREthApr(web3, blockNumber);
-    if (asset === 'sDAI')
-        return getDsrApy(web3);
-    if (asset === 'sUSDe')
-        return getSUSDeApy();
+    try {
+        if (asset === 'stETH' || asset === 'wstETH')
+            return getStETHApr(web3, fromBlock, blockNumber);
+        if (asset === 'cbETH')
+            return getCbETHApr(web3, blockNumber);
+        if (asset === 'rETH')
+            return getREthApr(web3, blockNumber);
+        if (asset === 'sDAI')
+            return getDsrApy(web3);
+        if (asset === 'sUSDe')
+            return getSUSDeApy();
+        if (asset === 'weETH')
+            return getWeEthApr();
+    }
+    catch (e) {
+        console.error(`Failed to fetch APY for ${asset}`);
+        return '0';
+    }
 };
 export const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -26,7 +26,7 @@ import {
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
-import { calculateNetApy, getStakingApy } from '../staking';
+import {calculateNetApy, getStakingApy, STAKING_ASSETS} from '../staking';
 import { multicall } from '../multicall';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
 import { getAssetsBalances } from '../assets';
@@ -268,7 +268,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
   await Promise.all(assetsData.map(async (_market: AaveV3AssetData) => {
     /* eslint-disable no-param-reassign */
     const rewardForMarket: IUiIncentiveDataProviderV3.AggregatedReserveIncentiveDataStructOutput | undefined = rewardInfo?.[_market.underlyingTokenAddress as any];
-    if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
+    if (STAKING_ASSETS.includes(_market.symbol)) {
       _market.incentiveSupplyApy = await getStakingApy(_market.symbol, defaultWeb3);
       _market.incentiveSupplyToken = _market.symbol;
     }

package/src/config/contracts.js

@@ -245,6 +245,9 @@ module.exports = {
       "1": {
         "address": "0xc3d688B66703497DAA19211EEdff47f25384cdc3"
       },
+      "10": {
+        "address": "0x2e44e174f7D53F0212823acC11C01A11d58c5bCB"
+      },
       "8453": {
         "address": "0xb125E6687d4313864e53df431d5425969c15Eb2F"
       },
@@ -293,6 +296,9 @@ module.exports = {
           }
         }
       },
+      "10": {
+        "address": "0x969d845618596787DBc64687Ee90b16931BBBCBC"
+      },
       "8453": {
         "address": "0x22591183c0eb7B2Fe07F6F44fd360d1117D07b4f"
       },
@@ -320,6 +326,9 @@ module.exports = {
   "CompV3BulkerL2": {
     "abi": [{"inputs":[{"internalType":"address","name":"admin_","type":"address"},{"internalType":"address payable","name":"wrappedNativeToken_","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"FailedToSendNativeToken","type":"error"},{"inputs":[],"name":"InvalidAddress","type":"error"},{"inputs":[],"name":"InvalidArgument","type":"error"},{"inputs":[],"name":"TransferInFailed","type":"error"},{"inputs":[],"name":"TransferOutFailed","type":"error"},{"inputs":[],"name":"Unauthorized","type":"error"},{"inputs":[],"name":"UnhandledAction","type":"error"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"oldAdmin","type":"address"},{"indexed":true,"internalType":"address","name":"newAdmin","type":"address"}],"name":"AdminTransferred","type":"event"},{"inputs":[],"name":"ACTION_CLAIM_REWARD","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ACTION_SUPPLY_ASSET","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ACTION_SUPPLY_NATIVE_TOKEN","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ACTION_TRANSFER_ASSET","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ACTION_WITHDRAW_ASSET","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ACTION_WITHDRAW_NATIVE_TOKEN","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"admin","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32[]","name":"actions","type":"bytes32[]"},{"internalType":"bytes[]","name":"data","type":"bytes[]"}],"name":"invoke","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"recipient","type":"address"}],"name":"sweepNativeToken","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"recipient","type":"address"},{"internalType":"address","name":"asset","type":"address"}],"name":"sweepToken","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newAdmin","type":"address"}],"name":"transferAdmin","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"wrappedNativeToken","outputs":[{"internalType":"address payable","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"stateMutability":"payable","type":"receive"}],
     "networks": {
+      "10": {
+        "address": "0xcb3643CC8294B23171272845473dEc49739d4Ba3"
+      },
       "8453": {
         "address": "0x78D0677032A35c63D142a48A2037048871212a8C"
       },

package/src/markets/compound/index.ts

@@ -44,11 +44,12 @@ const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBul
     [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
   },
-  [NetworkNumber.Opt]: { // Non-existing markets, keeping it because of typescript
+  [NetworkNumber.Opt]: {
+    [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
+    // Non-existing markets, keeping it because of typescript
     [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
   },
 };
@@ -70,7 +71,7 @@ export const COMPOUND_V2: CompoundMarketData = {
 };
 
 export const COMPOUND_V3_USDC = (networkId: NetworkNumber): CompoundMarketData => ({
-  chainIds: [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base],
+  chainIds: [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Opt],
   label: 'Compound V3 - USDC',
   shortLabel: 'v3',
   value: CompoundVersions.CompoundV3USDC,

package/src/markets/compound/marketsAssets.ts

@@ -9,11 +9,12 @@ export const compoundV2CollateralAssets = [
 export const v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
 export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
 export const v3USDCCollAssetsBase = ['ETH', 'cbETH'];
+export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const v3USDCCollAssets = {
   [NetworkNumber.Eth]: v3USDCCollAssetsEth,
-  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Opt]: v3USDCCollAssetsOpt,
   [NetworkNumber.Arb]: v3USDCCollAssetsArb,
   [NetworkNumber.Base]: v3USDCCollAssetsBase,
 } as const;

package/src/morphoBlue/index.ts

@@ -10,7 +10,7 @@ import {
   MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
 } from '../types';
 import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
-import { getStakingApy } from '../staking';
+import {getStakingApy, STAKING_ASSETS} from '../staking';
 import { getAbiItem, wethToEth } from '../services/utils';
 import { multicall } from '../multicall';
 import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
@@ -112,7 +112,7 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
     canBeBorrowed: false,
   };
 
-  if (['wstETH', 'cbETH', 'rETH', 'sUSDe'].includes(collateralTokenInfo.symbol)) {
+  if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
     assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
     assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
   }
@@ -175,4 +175,4 @@ export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumbe
     usedAssets,
     ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
   };
-}
+}

package/src/staking/staking.ts

@@ -82,12 +82,27 @@ export const getSUSDeApy = async () => {
   return data.apy;
 };
 
+const getWeEthApr = async () => {
+  const res = await fetch('https://www.etherfi.bid/api/etherfi/apr');
+  const data = await res.json();
+  const total = (data.latest_aprs as string[]).reduce((acc,apr) => new Dec(acc).add(apr).toString());
+  return new Dec(total).div(data.latest_aprs.length).div(100).toString();
+}
+
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI','weETH'];
+
 export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
-  if (asset === 'stETH' || asset === 'wstETH') return getStETHApr(web3, fromBlock, blockNumber);
-  if (asset === 'cbETH') return getCbETHApr(web3, blockNumber);
-  if (asset === 'rETH') return getREthApr(web3, blockNumber);
-  if (asset === 'sDAI') return getDsrApy(web3);
-  if (asset === 'sUSDe') return getSUSDeApy();
+  try {
+    if (asset === 'stETH' || asset === 'wstETH') return getStETHApr(web3, fromBlock, blockNumber);
+    if (asset === 'cbETH') return getCbETHApr(web3, blockNumber);
+    if (asset === 'rETH') return getREthApr(web3, blockNumber);
+    if (asset === 'sDAI') return getDsrApy(web3);
+    if (asset === 'sUSDe') return getSUSDeApy();
+    if (asset === 'weETH') return getWeEthApr();
+  } catch (e) {
+    console.error(`Failed to fetch APY for ${asset}`);
+    return '0';
+  }
 };
 
 export const calculateInterestEarned = (principal: string, interest: string, type: string, apy = false) => {
@@ -172,4 +187,4 @@ export const getStETHByWstETHMultiple = async (wstEthAmounts: string[] | number[
   }));
   const stEthAmounts = await multicall(calls, web3);
   return stEthAmounts.map((arr) => arr[0]);
-};
+};