@defisaver/positions-sdk 2.1.6-dev-debt-in-front → 2.1.6-dev-plasma-1

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,64 +1,64 @@
-# 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)
-- [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)
-
-## 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 { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    provider, // 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
-    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    provider,
-    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)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# 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)
+- [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)
+
+## 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 { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    provider, // 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
+    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    provider,
+    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)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/aaveV3/index.js

@@ -58,12 +58,12 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
 function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
-        const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
+        const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
         const isL2 = (0, utils_1.isLayer2Network)(network);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
         const marketAddress = market.providerAddress;
-        const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Linea];
+        const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Linea, common_1.NetworkNumber.Plasma];
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
             loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber)),
@@ -366,7 +366,7 @@ const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_
     const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
     const lendingPoolContract = (0, contracts_1.createViemContractFromConfigFunc)(market.lendingPool, market.lendingPoolAddress)(provider, network);
     const marketAddress = market.providerAddress;
-    const _addresses = market.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
+    const _addresses = market.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
     const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
     const [eModeCategory, tokenBalances1, tokenBalances2] = yield Promise.all([
         lendingPoolContract.read.getUserEMode([address], (0, viem_1.setViemBlockNumber)(blockNumber)),

package/cjs/aaveV3/merit.js

@@ -46,6 +46,9 @@ const MERIT_DATA_MAP = {
     [common_1.NetworkNumber.Linea]: {
         [types_1.AaveVersions.AaveV3]: {},
     },
+    [common_1.NetworkNumber.Plasma]: {
+        [types_1.AaveVersions.AaveV3]: {},
+    },
 };
 /**
  * Fetches merit rewards data from Aave API

package/cjs/aaveV3/merkl.d.ts

@@ -1,6 +1,6 @@
 import { MerkleRewardMap } from '../types';
 import { NetworkNumber } from '../types/common';
-export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;
 /**
  * aEthLidoUSDC -> aUSDC
  * USDC -> USDC

package/cjs/config/contracts.d.ts

@@ -28303,6 +28303,11 @@ export declare const AaveV3View: {
                 };
             };
         };
+        readonly "9745": {
+            readonly address: "0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C";
+            readonly createdBlock: 1880799;
+            readonly oldVersions: {};
+        };
     };
 };
 export declare const AaveV3PoolAddressesProvider: {
@@ -28763,6 +28768,9 @@ export declare const AaveV3PoolAddressesProvider: {
         readonly "59144": {
             readonly address: "0x89502c3731F69DDC95B65753708A07F8Cd0373F4";
         };
+        readonly "9745": {
+            readonly address: "0x061D8e131F26512348ee5FA42e2DF1bA9d6505E9";
+        };
     };
 };
 export declare const AaveV3LidoPoolAddressesProvider: {
@@ -31133,6 +31141,9 @@ export declare const AaveV3LendingPool: {
         readonly "59144": {
             readonly address: "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac";
         };
+        readonly "9745": {
+            readonly address: "0x925a2A7214Ed92428B5b1B090F80b25700095e12";
+        };
     };
 };
 export declare const AaveV3LidoLendingPool: {
@@ -34467,6 +34478,9 @@ export declare const AaveV3ProtocolDataProvider: {
         readonly "59144": {
             readonly address: "0x47cd4b507B81cB831669c71c7077f4daF6762FF4";
         };
+        readonly "9745": {
+            readonly address: "0xf2D6E38B407e31E7E7e4a16E6769728b76c7419F";
+        };
     };
 };
 export declare const AaveV3LidoProtocolDataProvider: {
@@ -35805,6 +35819,9 @@ export declare const AaveUiIncentiveDataProviderV3: {
         readonly "59144": {
             readonly address: "0x117684358D990E42Eb1649E7e8C4691951dc1E71";
         };
+        readonly "9745": {
+            readonly address: "0xcb85C501B3A5e9851850d66648d69B26A4c90942";
+        };
     };
 };
 export declare const cUSDCv3: {

package/cjs/config/contracts.js

@@ -231,6 +231,11 @@ exports.AaveV3View = {
                     "address": "0xc9D6EfA6e08B66a5Cdc516Bcd5807c2fa69E0f2A"
                 }
             },
+        },
+        "9745": {
+            "address": "0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C",
+            "createdBlock": 1880799,
+            "oldVersions": {},
         }
     }
 };
@@ -251,6 +256,9 @@ exports.AaveV3PoolAddressesProvider = {
         },
         "59144": {
             "address": "0x89502c3731F69DDC95B65753708A07F8Cd0373F4"
+        },
+        "9745": {
+            "address": "0x061D8e131F26512348ee5FA42e2DF1bA9d6505E9"
         }
     }
 };
@@ -287,6 +295,9 @@ exports.AaveV3LendingPool = {
         },
         "59144": {
             "address": "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac"
+        },
+        "9745": {
+            "address": "0x925a2A7214Ed92428B5b1B090F80b25700095e12"
         }
     }
 };
@@ -323,6 +334,9 @@ exports.AaveV3ProtocolDataProvider = {
         },
         "59144": {
             "address": "0x47cd4b507B81cB831669c71c7077f4daF6762FF4"
+        },
+        "9745": {
+            "address": "0xf2D6E38B407e31E7E7e4a16E6769728b76c7419F"
         }
     }
 };
@@ -359,6 +373,9 @@ exports.AaveUiIncentiveDataProviderV3 = {
         },
         "59144": {
             "address": "0x117684358D990E42Eb1649E7e8C4691951dc1E71"
+        },
+        "9745": {
+            "address": "0xcb85C501B3A5e9851850d66648d69B26A4c90942"
         }
     }
 };

package/cjs/helpers/aaveHelpers/index.d.ts

@@ -44,4 +44,4 @@ export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInf
 /**
  * won't cover all cases
  */
-export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;

package/cjs/helpers/aaveHelpers/index.js

@@ -65,7 +65,7 @@ const aaveAnyGetSuppliableAsCollAssets = (_a) => {
 };
 exports.aaveAnyGetSuppliableAsCollAssets = aaveAnyGetSuppliableAsCollAssets;
 const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
-    const asset = (0, utils_1.wethToEth)(_asset);
+    const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
     const assetData = assetsData[asset];
     const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || { collateralAssets: [], collateralFactor: '0', liquidationRatio: '0' };
     if (eModeCategory === 0
@@ -125,7 +125,7 @@ const getApyAfterValuesEstimationInner = (selectedMarket, actions, client, netwo
     const params = actions.map(({ action, asset, amount }) => {
         const isDebtAsset = constants_1.borrowOperations.includes(action);
         const amountInWei = (0, tokens_1.assetAmountInWei)(amount, asset);
-        const assetInfo = (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(asset), network);
+        const assetInfo = (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(asset), network);
         let liquidityAdded;
         let liquidityTaken;
         if (isDebtAsset) {
@@ -147,7 +147,7 @@ const getApyAfterValuesEstimationInner = (selectedMarket, actions, client, netwo
     const data = yield viewContract.read.getApyAfterValuesEstimation([selectedMarket.providerAddress, params]);
     const rates = {};
     data.forEach((d) => {
-        const asset = (0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(d.reserveAddress, network).symbol);
+        const asset = (0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(d.reserveAddress, network).symbol);
         rates[asset] = {
             supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(d.supplyRate.toString()).div(1e25).toString()),
             borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(d.variableBorrowRate.toString()).div(1e25).toString()),
@@ -167,9 +167,11 @@ const getAaveUnderlyingSymbol = (_symbol = '') => {
         .replace(/^aEth/, '')
         .replace(/^aArb/, '')
         .replace(/^aOpt/, '')
+        .replace(/^aLin/, '')
+        .replace(/^aPla/, '')
         .replace(/^aBas/, '');
     if (symbol.startsWith('a'))
         symbol = symbol.slice(1);
-    return (0, utils_1.wethToEth)(symbol);
+    return (0, utils_1.getNativeAssetFromWrapped)(symbol);
 };
 exports.getAaveUnderlyingSymbol = getAaveUnderlyingSymbol;

package/cjs/helpers/morphoBlueHelpers/index.d.ts

@@ -56,4 +56,4 @@ export declare const getRewardsForMarket: (marketId: string, network?: NetworkNu
     supplyApy: string;
     borrowApy: string;
 }>;
-export declare const getMorphoUnderlyingSymbol: (_symbol: string) => any;
+export declare const getMorphoUnderlyingSymbol: (_symbol: string) => string;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/liquityV2/index.d.ts

@@ -23,8 +23,6 @@ export declare const getLiquityV2UserTroveIds: (provider: EthereumProvider, netw
     }[];
     nextFreeTroveIndex: string;
 }>;
-export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
-export declare const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2: (newDebt: string, markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: Client, network: NetworkNumber, interestRate: string) => Promise<string>;
 export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: EthereumProvider, network: NetworkNumber, isLegacy: boolean, interestRate: string, debtInFrontBeingMoved?: string) => Promise<string>;
 export declare const _getLiquityV2TroveData: (provider: Client, network: NetworkNumber, { selectedMarket, assetsData, troveId, allMarketsData, }: {
     selectedMarket: LiquityV2MarketInfo;

package/cjs/liquityV2/index.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.getLiquitySAndYBold = exports.getLiquityV2Staking = exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = exports.calculateDebtInFrontLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
+exports.getLiquitySAndYBold = exports.getLiquityV2Staking = exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
@@ -201,39 +201,11 @@ const getAllMarketsUnbackedDebts = (markets, isLegacy, provider, network) => __a
     return Object.fromEntries(allMarketsUnbackedDebt);
 });
 const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront) => {
-    // Sanity check to avoid division by 0. Very unlikely to ever happen.
-    const selectedMarketTotalBorrow = new decimal_js_1.default(markets[selectedMarket].assetsData[(0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket].debtToken].totalBorrow);
-    if (selectedMarketTotalBorrow.eq(0))
-        return new decimal_js_1.default(0).toString();
     const selectedMarketUnbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[selectedMarket]);
     const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
-    const totalUnbackedDebt = Object.values(allMarketsUnbackedDebts).reduce((acc, val) => acc.plus(new decimal_js_1.default(val)), new decimal_js_1.default(0));
-    // When totalUnbackedDebt is 0, redemptions will be proportional with the branch size and not to unbacked debt.
-    // When unbacked debt is 0 for branch, next redemption call won't touch that branch, so in order to estimate total debt in front we will:
-    // - First add up all the unbacked debt from other branches, as that will be the only debt that will be redeemed on the fist redemption call
-    // - Perform split the same way as we would do when totalUnbackedDebt == 0, this would represent the second call to the redemption function
-    if (selectedMarketUnbackedDebt.eq(0)) {
-        // Special case if the branch debt in front is 0, it means that all debt in front is unbacked debt from other branches.
-        if (new decimal_js_1.default(interestRateDebtInFront).eq(0))
-            return totalUnbackedDebt.toString();
-        // Then calculate how much of that estimated amount would go to each branch
-        // Second redemption call - calculate proportional redemption based on updated total debt
-        const amountBeingRedeemedOnEachMarketByTotalBorrow = Object.entries(markets).map(([version, market]) => {
-            const { isLegacy: isLegacyMarket } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
-            if (version === selectedMarket && isLegacyMarket !== isLegacy)
-                return new decimal_js_1.default(interestRateDebtInFront);
-            const { assetsData } = market;
-            const { debtToken } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
-            // For other markets, subtract their unbacked debt as it will be cleared in first redemption call
-            const marketUnbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[version]);
-            const totalBorrow = new decimal_js_1.default(assetsData[debtToken].totalBorrow).sub(marketUnbackedDebt);
-            const amountToRedeem = new decimal_js_1.default(interestRateDebtInFront).mul(totalBorrow).div(selectedMarketTotalBorrow);
-            return decimal_js_1.default.min(amountToRedeem, totalBorrow);
-        });
-        const redemptionAmount = amountBeingRedeemedOnEachMarketByTotalBorrow.reduce((acc, val) => acc.plus(val), new decimal_js_1.default(0));
-        return totalUnbackedDebt.plus(redemptionAmount).toString();
-    }
-    const amountBeingRedeemedOnEachMarketByUnbackedDebt = Object.entries(markets).map(([version, market]) => {
+    if (selectedMarketUnbackedDebt.eq(0))
+        return interestRateDebtInFront;
+    const amountBeingReedemedOnEachMarket = Object.entries(markets).map(([version, market]) => {
         const { isLegacy: isLegacyMarket } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
         if (version === selectedMarket && isLegacyMarket !== isLegacy)
             return new decimal_js_1.default(interestRateDebtInFront);
@@ -241,31 +213,16 @@ const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnback
         const { debtToken } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[version];
         const unbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[version]);
         const totalBorrow = new decimal_js_1.default(assetsData[debtToken].totalBorrow);
-        const amountToRedeem = new decimal_js_1.default(interestRateDebtInFront).mul(unbackedDebt).div(selectedMarketUnbackedDebt);
-        return decimal_js_1.default.min(amountToRedeem, totalBorrow);
+        const amountToReedem = new decimal_js_1.default(interestRateDebtInFront).mul(unbackedDebt).div(selectedMarketUnbackedDebt);
+        return decimal_js_1.default.min(amountToReedem, totalBorrow);
     });
-    return amountBeingRedeemedOnEachMarketByUnbackedDebt.reduce((acc, val) => acc.plus(val), new decimal_js_1.default(0)).toString();
+    return amountBeingReedemedOnEachMarket.reduce((acc, val) => acc.plus(val), new decimal_js_1.default(0)).toString();
 };
-exports.calculateDebtInFrontLiquityV2 = calculateDebtInFrontLiquityV2;
-// @dev The amount redeemed on each branch depends on the unbacked debt of every branch (the difference between total borrow and stability pool deposits).
-// When new debt is generated on the selected market, the unbacked debt will increase, resulting in a higher redemption amount on that branch.
-// This function accepts the new debt that's about to be generated (e.g., trove creation) and estimates the debt in front based on the new state.
-const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = (newDebt, markets, selectedMarket, provider, network, interestRate) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketsWithNewDebt = structuredClone(markets);
-    const selectedMarketDebtToken = (0, markets_1.LiquityV2Markets)(network)[selectedMarket].debtToken;
-    const currentTotalBorrow = new decimal_js_1.default(marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow);
-    marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow = currentTotalBorrow.add(newDebt).toString();
-    const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
-    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(marketsWithNewDebt, isLegacy, provider, network);
-    const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate));
-    return (0, exports.calculateDebtInFrontLiquityV2)(marketsWithNewDebt, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
-});
-exports.getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = getDebtInFrontForInterestRateIncludingNewDebtLiquityV2;
 const getDebtInFrontLiquityV2 = (markets, selectedMarket, provider, network, viewContract, troveId) => __awaiter(void 0, void 0, void 0, function* () {
     const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
     const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network);
     const interestRateDebtInFront = yield getDebtInFrontForSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, troveId);
-    return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
+    return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 /**
  * @param markets
@@ -280,7 +237,7 @@ const _getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, pr
     const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network);
     const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate))
         .sub(debtInFrontBeingMoved);
-    return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
+    return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 const getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, isLegacy, interestRate, debtInFrontBeingMoved = '0') { return _getDebtInFrontForInterestRateLiquityV2(markets, selectedMarket, (0, viem_1.getViemProvider)(provider, network), network, isLegacy, interestRate, debtInFrontBeingMoved); });
 exports.getDebtInFrontForInterestRateLiquityV2 = getDebtInFrontForInterestRateLiquityV2;

package/cjs/markets/aave/index.js

@@ -45,7 +45,7 @@ exports.AAVE_V2 = {
     protocolName: 'aave',
 };
 const AAVE_V3 = (networkId) => ({
-    chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Linea],
+    chainIds: [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Linea, common_1.NetworkNumber.Plasma],
     label: networkId === common_1.NetworkNumber.Eth ? 'Aave v3 Core' : 'Aave v3',
     shortLabel: 'v3',
     value: types_1.AaveVersions.AaveV3,

package/cjs/markets/aave/marketAssets.d.ts

@@ -6,12 +6,14 @@ export declare const aaveV3AssetsDefaultMarketOpt: string[];
 export declare const aaveV3AssetsDefaultMarketArb: string[];
 export declare const aaveV3AssetsDefaultMarketBase: string[];
 export declare const aaveV3AssetsDefaultMarketLinea: string[];
+export declare const aaveV3AssetsDefaultMarketPlasma: string[];
 export declare const aaveV3AssetsDefaultMarket: {
     readonly 1: string[];
     readonly 10: string[];
     readonly 42161: string[];
     readonly 8453: string[];
     readonly 59144: string[];
+    readonly 9745: string[];
 };
 export declare const aaveV3AssetsLidoMarketEth: string[];
 export declare const aaveV3AssetsLidoMarket: {
@@ -20,6 +22,7 @@ export declare const aaveV3AssetsLidoMarket: {
     readonly 42161: readonly [];
     readonly 8453: readonly [];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };
 export declare const aaveV3AssetsEtherfiMarketEth: string[];
 export declare const aaveV3AssetsEtherfiMarket: {
@@ -28,4 +31,5 @@ export declare const aaveV3AssetsEtherfiMarket: {
     readonly 42161: readonly [];
     readonly 8453: readonly [];
     readonly 59144: readonly [];
+    readonly 9745: readonly [];
 };