@defisaver/positions-sdk 0.0.122 → 0.0.124

package/cjs/compoundV3/index.d.ts

@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import { CompoundMarketData, CompoundV3AssetsData, CompoundV3MarketsData, CompoundV3PositionData } from '../types/compound';
+import { CompoundMarketData, CompoundV3AssetsData, CompoundV3MarketsData, CompoundV3PositionData } from '../types';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
 export declare const getCompoundV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultWeb3: Web3) => Promise<CompoundV3MarketsData>;
 export declare const EMPTY_COMPOUND_V3_DATA: {

package/cjs/compoundV3/index.js

@@ -24,6 +24,7 @@ const moneymarket_1 = require("../moneymarket");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
 const compound_1 = require("../markets/compound");
 const priceService_1 = require("../services/priceService");
+const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(asset), network)).map(addr => addr.address.toLowerCase());
 const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield (0, priceService_1.getEthPrice)(defaultWeb3) : yield (0, priceService_1.getUSDCPrice)(defaultWeb3);
     const compPrice = yield (0, priceService_1.getCompPrice)(defaultWeb3);
@@ -42,7 +43,10 @@ const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) =>
         },
     ];
     const data = yield (0, multicall_1.multicall)(calls, web3, network);
-    const colls = data[1].colls.map((coll) => (0, compoundHelpers_1.formatMarketData)(coll, network, baseAssetPrice));
+    const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
+    const colls = data[1].colls
+        .filter((coll) => supportedAssetsAddresses.includes(coll.tokenAddr.toLowerCase()))
+        .map((coll) => (0, compoundHelpers_1.formatMarketData)(coll, network, baseAssetPrice));
     for (const coll of colls) {
         if (coll.symbol === 'wstETH') {
             // eslint-disable-next-line no-await-in-loop
@@ -180,7 +184,11 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
             usedAssets[baseAssetSymbol].borrowedUsd = (0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol);
         }
     }
+    const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
     loanData.collAddr.forEach((coll, i) => {
+        // not filtering collAddr because there is no way of knowing how to filter loanData.collAmounts
+        if (!supportedAssetsAddresses.includes(coll.toLowerCase()))
+            return;
         const assetInfo = (0, tokens_1.getAssetInfoByAddress)(coll, network);
         const symbol = (0, utils_1.wethToEth)(assetInfo.symbol);
         const supplied = (0, tokens_1.assetAmountInEth)(loanData.collAmounts[i].toString(), symbol);

package/cjs/config/contracts.d.ts

@@ -2375,6 +2375,9 @@ export namespace cETHv3 {
         "1": {
             address: string;
         };
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };

package/cjs/config/contracts.js

@@ -353,6 +353,9 @@ module.exports = {
             "1": {
                 "address": "0xa17581a9e3356d9a858b789d68b4d866e593ae94"
             },
+            "10": {
+                "address": "0xE36A30D249f7761327fd973001A32010b521b6Fd"
+            },
             "8453": {
                 "address": "0x46e6b214b524310239732D51387075E0e70970bf"
             },

package/cjs/markets/compound/index.js

@@ -102,7 +102,7 @@ const COMPOUND_V3_USDCe = (networkId) => ({
 });
 exports.COMPOUND_V3_USDCe = COMPOUND_V3_USDCe;
 const COMPOUND_V3_ETH = (networkId) => ({
-    chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Base, common_1.NetworkNumber.Arb],
+    chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Base, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt],
     label: 'Compound V3 - ETH',
     shortLabel: 'v3',
     value: types_1.CompoundVersions.CompoundV3ETH,

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

@@ -19,9 +19,10 @@ export declare const v3USDCeCollAssets: {
 export declare const v3ETHCollAssetsEth: string[];
 export declare const v3ETHCollAssetsBase: string[];
 export declare const v3ETHCollAssetsArb: string[];
+export declare const v3ETHCollAssetsOpt: string[];
 export declare const v3ETHCollAssets: {
     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.v3USDTCollAssets = exports.v3USDTCollAssetsOpt = exports.v3USDTCollAssetsArb = exports.v3USDTCollAssetsEth = exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsArb = exports.v3ETHCollAssetsBase = exports.v3ETHCollAssetsEth = exports.v3USDCeCollAssets = exports.v3USDCeCollAssetsArb = exports.v3USDCCollAssets = exports.v3USDCCollAssetsOpt = exports.v3USDCCollAssetsBase = exports.v3USDCCollAssetsArb = exports.v3USDCCollAssetsEth = exports.compoundV2CollateralAssets = void 0;
+exports.v3USDTCollAssets = exports.v3USDTCollAssetsOpt = exports.v3USDTCollAssetsArb = exports.v3USDTCollAssetsEth = exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsOpt = exports.v3ETHCollAssetsArb = 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 = [
@@ -9,8 +9,8 @@ exports.compoundV2CollateralAssets = [
 ].map((symbol) => (0, tokens_1.getAssetInfo)(symbol));
 exports.v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH'];
 exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH'];
-exports.v3USDCCollAssetsBase = ['ETH', 'cbETH'];
-exports.v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC'];
+exports.v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH'];
+exports.v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
 // @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,
@@ -28,11 +28,12 @@ exports.v3USDCeCollAssets = {
 };
 exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH'];
 exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH'];
-exports.v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC'];
+exports.v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH'];
+exports.v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3ETHCollAssets = {
     [common_1.NetworkNumber.Eth]: exports.v3ETHCollAssetsEth,
-    [common_1.NetworkNumber.Opt]: [],
+    [common_1.NetworkNumber.Opt]: exports.v3ETHCollAssetsOpt,
     [common_1.NetworkNumber.Arb]: exports.v3ETHCollAssetsArb,
     [common_1.NetworkNumber.Base]: exports.v3ETHCollAssetsBase,
 };
@@ -46,7 +47,7 @@ exports.v3USDbCCollAssets = {
 };
 exports.v3USDTCollAssetsEth = ['ETH', 'WBTC', 'wstETH', 'COMP', 'UNI', 'LINK'];
 exports.v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
-exports.v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP'];
+exports.v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3USDTCollAssets = {
     [common_1.NetworkNumber.Eth]: exports.v3USDTCollAssetsEth,

package/esm/compoundV3/index.d.ts

@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import { CompoundMarketData, CompoundV3AssetsData, CompoundV3MarketsData, CompoundV3PositionData } from '../types/compound';
+import { CompoundMarketData, CompoundV3AssetsData, CompoundV3MarketsData, CompoundV3PositionData } from '../types';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
 export declare const getCompoundV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultWeb3: Web3) => Promise<CompoundV3MarketsData>;
 export declare const EMPTY_COMPOUND_V3_DATA: {

package/esm/compoundV3/index.js

@@ -12,12 +12,13 @@ import { assetAmountInEth, assetAmountInWei, getAssetInfo, getAssetInfoByAddress
 import { CompV3ViewContract } from '../contracts';
 import { multicall } from '../multicall';
 import { getStakingApy, getStETHByWstETHMultiple, getWstETHByStETH, STAKING_ASSETS, } from '../staking';
-import { wethToEth } from '../services/utils';
+import { ethToWeth, wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { formatBaseData, formatMarketData, getCompoundV3AggregatedData, getIncentiveApys, } from '../helpers/compoundHelpers';
 import { COMPOUND_V3_ETH, COMPOUND_V3_USDBC, COMPOUND_V3_USDC } from '../markets/compound';
 import { getEthPrice, getCompPrice, getUSDCPrice } from '../services/priceService';
+const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => getAssetInfo(ethToWeth(asset), network)).map(addr => addr.address.toLowerCase());
 export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield getEthPrice(defaultWeb3) : yield getUSDCPrice(defaultWeb3);
     const compPrice = yield getCompPrice(defaultWeb3);
@@ -36,7 +37,10 @@ export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultW
         },
     ];
     const data = yield multicall(calls, web3, network);
-    const colls = data[1].colls.map((coll) => formatMarketData(coll, network, baseAssetPrice));
+    const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
+    const colls = data[1].colls
+        .filter((coll) => supportedAssetsAddresses.includes(coll.tokenAddr.toLowerCase()))
+        .map((coll) => formatMarketData(coll, network, baseAssetPrice));
     for (const coll of colls) {
         if (coll.symbol === 'wstETH') {
             // eslint-disable-next-line no-await-in-loop
@@ -172,7 +176,11 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
             usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
         }
     }
+    const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
     loanData.collAddr.forEach((coll, i) => {
+        // not filtering collAddr because there is no way of knowing how to filter loanData.collAmounts
+        if (!supportedAssetsAddresses.includes(coll.toLowerCase()))
+            return;
         const assetInfo = getAssetInfoByAddress(coll, network);
         const symbol = wethToEth(assetInfo.symbol);
         const supplied = assetAmountInEth(loanData.collAmounts[i].toString(), symbol);

package/esm/config/contracts.d.ts

@@ -2375,6 +2375,9 @@ export namespace cETHv3 {
         "1": {
             address: string;
         };
+        "10": {
+            address: string;
+        };
         "8453": {
             address: string;
         };

package/esm/config/contracts.js

@@ -352,6 +352,9 @@ module.exports = {
             "1": {
                 "address": "0xa17581a9e3356d9a858b789d68b4d866e593ae94"
             },
+            "10": {
+                "address": "0xE36A30D249f7761327fd973001A32010b521b6Fd"
+            },
             "8453": {
                 "address": "0x46e6b214b524310239732D51387075E0e70970bf"
             },

package/esm/markets/compound/index.js

@@ -92,7 +92,7 @@ export const COMPOUND_V3_USDCe = (networkId) => ({
     // icon: SvgAdapter(protocolIcons.compoundv3),
 });
 export const COMPOUND_V3_ETH = (networkId) => ({
-    chainIds: [NetworkNumber.Eth, NetworkNumber.Base, NetworkNumber.Arb],
+    chainIds: [NetworkNumber.Eth, NetworkNumber.Base, NetworkNumber.Arb, NetworkNumber.Opt],
     label: 'Compound V3 - ETH',
     shortLabel: 'v3',
     value: CompoundVersions.CompoundV3ETH,

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

@@ -19,9 +19,10 @@ export declare const v3USDCeCollAssets: {
 export declare const v3ETHCollAssetsEth: string[];
 export declare const v3ETHCollAssetsBase: string[];
 export declare const v3ETHCollAssetsArb: string[];
+export declare const v3ETHCollAssetsOpt: string[];
 export declare const v3ETHCollAssets: {
     readonly 1: string[];
-    readonly 10: readonly [];
+    readonly 10: string[];
     readonly 42161: string[];
     readonly 8453: string[];
 };

package/esm/markets/compound/marketsAssets.js

@@ -6,8 +6,8 @@ export const compoundV2CollateralAssets = [
 ].map((symbol) => getAssetInfo(symbol));
 export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH'];
 export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH'];
-export const v3USDCCollAssetsBase = ['ETH', 'cbETH'];
-export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC'];
+export const v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH'];
+export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
 // @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,
@@ -25,11 +25,12 @@ export const v3USDCeCollAssets = {
 };
 export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH'];
 export const v3ETHCollAssetsBase = ['cbETH', 'ezETH'];
-export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC'];
+export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH'];
+export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const v3ETHCollAssets = {
     [NetworkNumber.Eth]: v3ETHCollAssetsEth,
-    [NetworkNumber.Opt]: [],
+    [NetworkNumber.Opt]: v3ETHCollAssetsOpt,
     [NetworkNumber.Arb]: v3ETHCollAssetsArb,
     [NetworkNumber.Base]: v3ETHCollAssetsBase,
 };
@@ -43,7 +44,7 @@ export const v3USDbCCollAssets = {
 };
 export const v3USDTCollAssetsEth = ['ETH', 'WBTC', 'wstETH', 'COMP', 'UNI', 'LINK'];
 export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
-export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP'];
+export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const v3USDTCollAssets = {
     [NetworkNumber.Eth]: v3USDTCollAssetsEth,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.122",
+  "version": "0.0.124",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -20,7 +20,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.5.30",
+    "@defisaver/tokens": "^1.5.31",
     "@ethersproject/bignumber": "^5.7.0",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
     "decimal.js": "^10.4.3"

package/src/compoundV3/index.ts

@@ -6,15 +6,15 @@ import {
 import { CompV3ViewContract } from '../contracts';
 import { multicall } from '../multicall';
 import {
-  CompoundV3AssetData, CompoundMarketData, CompoundV3AssetsData, CompoundV3UsedAssets, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions,
-} from '../types/compound';
+  CompoundV3AssetData, CompoundMarketData, CompoundV3AssetsData, CompoundV3UsedAssets, CompoundV3MarketsData, CompoundV3PositionData,
+} from '../types';
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
 import {
   getStakingApy, getStETHByWstETHMultiple, getWstETHByStETH, STAKING_ASSETS,
 } from '../staking';
-import { wethToEth } from '../services/utils';
+import { ethToWeth, wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import {
@@ -23,6 +23,8 @@ import {
 import { COMPOUND_V3_ETH, COMPOUND_V3_USDBC, COMPOUND_V3_USDC } from '../markets/compound';
 import { getEthPrice, getCompPrice, getUSDCPrice } from '../services/priceService';
 
+const getSupportedAssetsAddressesForMarket = (selectedMarket: CompoundMarketData, network: NetworkNumber) => selectedMarket.collAssets.map(asset => getAssetInfo(ethToWeth(asset), network)).map(addr => addr.address.toLowerCase());
+
 export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultWeb3: Web3): Promise<CompoundV3MarketsData> => {
   const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? await getEthPrice(defaultWeb3) : await getUSDCPrice(defaultWeb3);
   const compPrice = await getCompPrice(defaultWeb3);
@@ -41,7 +43,12 @@ export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumbe
     },
   ];
   const data = await multicall(calls, web3, network);
-  const colls = data[1].colls.map((coll: any) => formatMarketData(coll, network, baseAssetPrice)) as CompoundV3AssetData[];
+  const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
+
+  const colls = data[1].colls
+    .filter((coll: any) => supportedAssetsAddresses.includes(coll.tokenAddr.toLowerCase()))
+    .map((coll: any) => formatMarketData(coll, network, baseAssetPrice)) as CompoundV3AssetData[];
+
   for (const coll of colls) {
     if (coll.symbol === 'wstETH') {
       // eslint-disable-next-line no-await-in-loop
@@ -219,7 +226,11 @@ export const getCompoundV3AccountData = async (
       usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
     }
   }
+  const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
+
   loanData.collAddr.forEach((coll: string, i: number): void => {
+    // not filtering collAddr because there is no way of knowing how to filter loanData.collAmounts
+    if (!supportedAssetsAddresses.includes(coll.toLowerCase())) return;
     const assetInfo = getAssetInfoByAddress(coll, network);
     const symbol = wethToEth(assetInfo.symbol);
     const supplied = assetAmountInEth(loanData.collAmounts[i].toString(), symbol);

package/src/config/contracts.js

@@ -353,6 +353,9 @@ module.exports = {
       "1": {
         "address": "0xa17581a9e3356d9a858b789d68b4d866e593ae94"
       },
+      "10": {
+        "address": "0xE36A30D249f7761327fd973001A32010b521b6Fd"
+      },
       "8453": {
         "address": "0x46e6b214b524310239732D51387075E0e70970bf"
       },

package/src/markets/compound/index.ts

@@ -117,7 +117,7 @@ export const COMPOUND_V3_USDCe = (networkId: NetworkNumber): CompoundMarketData
 });
 
 export const COMPOUND_V3_ETH = (networkId: NetworkNumber): CompoundMarketData => ({
-  chainIds: [NetworkNumber.Eth, NetworkNumber.Base, NetworkNumber.Arb],
+  chainIds: [NetworkNumber.Eth, NetworkNumber.Base, NetworkNumber.Arb, NetworkNumber.Opt],
   label: 'Compound V3 - ETH',
   shortLabel: 'v3',
   value: CompoundVersions.CompoundV3ETH,

package/src/markets/compound/marketsAssets.ts

@@ -8,8 +8,8 @@ export const compoundV2CollateralAssets = [
 
 export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH'];
 export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH'];
-export const v3USDCCollAssetsBase = ['ETH', 'cbETH'];
-export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC'];
+export const v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH'];
+export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const v3USDCCollAssets = {
@@ -31,12 +31,13 @@ export const v3USDCeCollAssets = {
 
 export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH'];
 export const v3ETHCollAssetsBase = ['cbETH', 'ezETH'];
-export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC'];
+export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH'];
+export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const v3ETHCollAssets = {
   [NetworkNumber.Eth]: v3ETHCollAssetsEth,
-  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Opt]: v3ETHCollAssetsOpt,
   [NetworkNumber.Arb]: v3ETHCollAssetsArb,
   [NetworkNumber.Base]: v3ETHCollAssetsBase,
 } as const;
@@ -53,7 +54,7 @@ export const v3USDbCCollAssets = {
 
 export const v3USDTCollAssetsEth = ['ETH', 'WBTC', 'wstETH', 'COMP', 'UNI', 'LINK'];
 export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
-export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP'];
+export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const v3USDTCollAssets = {