@defisaver/positions-sdk 0.0.17 → 0.0.18

package/cjs/aaveV3/index.d.ts

@@ -29,5 +29,5 @@ export declare const EMPTY_AAVE_DATA: {
     suppliedCollateralUsd: string;
 };
 export declare const getAaveV3AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any, customGetAggregatedDataFunction?: Function) => Promise<AaveV3PositionData>;
+export declare const getAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any) => Promise<AaveV3PositionData>;
 export declare const getAaveV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, mainnetWeb3: Web3) => Promise<AaveV3PositionData>;

package/cjs/aaveV3/index.js

@@ -288,7 +288,7 @@ const getAaveV3AccountBalances = (web3, network, block, addressMapping, address)
     return balances;
 });
 exports.getAaveV3AccountBalances = getAaveV3AccountBalances;
-const getAaveV3AccountData = (web3, network, address, extractedState, customGetAggregatedDataFunction) => __awaiter(void 0, void 0, void 0, function* () {
+const getAaveV3AccountData = (web3, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
     const { selectedMarket: market, assetsData, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -359,9 +359,8 @@ const getAaveV3AccountData = (web3, network, address, extractedState, customGetA
         usedAssets[asset] = Object.assign(Object.assign({}, usedAssets[asset]), { symbol: asset, supplied, suppliedUsd: new decimal_js_1.default(supplied).mul(assetsData[asset].price).toString(), isSupplied, collateral: enabledAsCollateral, stableBorrowRate: new decimal_js_1.default(tokenInfo.stableBorrowRate).div(1e25).toString(), discountedBorrowRate: new decimal_js_1.default(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString(), borrowedStable,
             borrowedVariable, borrowedUsdStable: new decimal_js_1.default(borrowedStable).mul(assetsData[asset].price).toString(), borrowedUsdVariable: new decimal_js_1.default(borrowedVariable).mul(assetsData[asset].price).toString(), borrowed, borrowedUsd: new decimal_js_1.default(new decimal_js_1.default(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(), isBorrowed, eModeCategory: assetsData[asset].eModeCategory, interestMode });
     }));
-    const aggregateFunction = customGetAggregatedDataFunction || aaveHelpers_1.aaveAnyGetAggregatedPositionData;
     payload.eModeCategory = +multicallRes[0][0];
-    payload = Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), aggregateFunction(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: payload.eModeCategory })));
+    payload = Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), (0, aaveHelpers_1.aaveAnyGetAggregatedPositionData)(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: payload.eModeCategory })));
     payload.eModeCategories = (0, exports.aaveV3EmodeCategoriesMapping)(extractedState, usedAssets);
     payload.isInIsolationMode = (0, aaveHelpers_1.aaveV3IsInIsolationMode)({ usedAssets, assetsData });
     payload.isInSiloedMode = (0, aaveHelpers_1.aaveV3IsInSiloedMode)({ usedAssets, assetsData });

package/cjs/compoundV3/index.d.ts

@@ -33,5 +33,5 @@ export declare const getCompoundV3AccountBalances: (web3: Web3, network: Network
 export declare const getCompoundV3AccountData: (web3: Web3, network: NetworkNumber, address: string, proxyAddress: string, extractedState: ({
     selectedMarket: CompoundMarketData;
     assetsData: CompoundV3AssetsData;
-}), customGetAggregatedDataFunction?: Function) => Promise<CompoundV3PositionData>;
+})) => Promise<CompoundV3PositionData>;
 export declare const getCompoundV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, proxyAddress: string, selectedMarket: CompoundMarketData, mainnetWeb3: Web3) => Promise<CompoundV3PositionData>;

package/cjs/compoundV3/index.js

@@ -144,7 +144,7 @@ const getCompoundV3AccountBalances = (web3, network, block, addressMapping, addr
     return balances;
 });
 exports.getCompoundV3AccountBalances = getCompoundV3AccountBalances;
-const getCompoundV3AccountData = (web3, network, address, proxyAddress, extractedState, customGetAggregatedDataFunction) => __awaiter(void 0, void 0, void 0, function* () {
+const getCompoundV3AccountData = (web3, network, address, proxyAddress, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
     if (!address)
         throw new Error('No address provided');
     const { selectedMarket, assetsData, } = extractedState;
@@ -197,8 +197,7 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
             supplied,
             suppliedUsd, isBorrowed: false, symbol, collateral: true });
     });
-    const aggregateFunction = customGetAggregatedDataFunction || compoundHelpers_1.getCompoundV3AggregatedData;
-    payload = Object.assign(Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), aggregateFunction({
+    payload = Object.assign(Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), (0, compoundHelpers_1.getCompoundV3AggregatedData)({
         usedAssets, assetsData, network, selectedMarket,
     })), { isAllowed: data[1][0] });
     // Calculate borrow limits per asset

package/cjs/config/contracts.d.ts

@@ -2451,7 +2451,7 @@ export namespace crvUSDtBTCController {
     };
     export { networks_41 as networks };
 }
-export namespace crvUSDwstETHAmm {
+export namespace crvUSDsfrxETHController {
     let abi_42: ({
         name: string;
         inputs: {
@@ -2473,6 +2473,13 @@ export namespace crvUSDwstETHAmm {
         outputs: never[];
         name?: undefined;
         anonymous?: undefined;
+    } | {
+        stateMutability: string;
+        type: string;
+        name?: undefined;
+        inputs?: undefined;
+        anonymous?: undefined;
+        outputs?: undefined;
     } | {
         stateMutability: string;
         type: string;
@@ -2486,6 +2493,23 @@ export namespace crvUSDwstETHAmm {
             type: string;
         }[];
         anonymous?: undefined;
+    } | {
+        stateMutability: string;
+        type: string;
+        name: string;
+        inputs: {
+            name: string;
+            type: string;
+        }[];
+        outputs: {
+            name: string;
+            type: string;
+            components: {
+                name: string;
+                type: string;
+            }[];
+        }[];
+        anonymous?: undefined;
     })[];
     export { abi_42 as abi };
     let networks_42: {
@@ -2495,7 +2519,7 @@ export namespace crvUSDwstETHAmm {
     };
     export { networks_42 as networks };
 }
-export namespace crvUSDETHAmm {
+export namespace crvUSDwstETHAmm {
     let abi_43: ({
         name: string;
         inputs: {
@@ -2539,7 +2563,7 @@ export namespace crvUSDETHAmm {
     };
     export { networks_43 as networks };
 }
-export namespace crvUSDWBTCAmm {
+export namespace crvUSDETHAmm {
     let abi_44: ({
         name: string;
         inputs: {
@@ -2583,7 +2607,7 @@ export namespace crvUSDWBTCAmm {
     };
     export { networks_44 as networks };
 }
-export namespace crvUSDtBTCAmm {
+export namespace crvUSDWBTCAmm {
     let abi_45: ({
         name: string;
         inputs: {
@@ -2627,8 +2651,96 @@ export namespace crvUSDtBTCAmm {
     };
     export { networks_45 as networks };
 }
-export namespace crvUSDView {
+export namespace crvUSDtBTCAmm {
     let abi_46: ({
+        name: string;
+        inputs: {
+            name: string;
+            type: string;
+            indexed: boolean;
+        }[];
+        anonymous: boolean;
+        type: string;
+        stateMutability?: undefined;
+        outputs?: undefined;
+    } | {
+        stateMutability: string;
+        type: string;
+        inputs: {
+            name: string;
+            type: string;
+        }[];
+        outputs: never[];
+        name?: undefined;
+        anonymous?: undefined;
+    } | {
+        stateMutability: string;
+        type: string;
+        name: string;
+        inputs: {
+            name: string;
+            type: string;
+        }[];
+        outputs: {
+            name: string;
+            type: string;
+        }[];
+        anonymous?: undefined;
+    })[];
+    export { abi_46 as abi };
+    let networks_46: {
+        "1": {
+            address: string;
+        };
+    };
+    export { networks_46 as networks };
+}
+export namespace crvUSDsfrxETHAmm {
+    let abi_47: ({
+        name: string;
+        inputs: {
+            name: string;
+            type: string;
+            indexed: boolean;
+        }[];
+        anonymous: boolean;
+        type: string;
+        stateMutability?: undefined;
+        outputs?: undefined;
+    } | {
+        stateMutability: string;
+        type: string;
+        inputs: {
+            name: string;
+            type: string;
+        }[];
+        outputs: never[];
+        name?: undefined;
+        anonymous?: undefined;
+    } | {
+        stateMutability: string;
+        type: string;
+        name: string;
+        inputs: {
+            name: string;
+            type: string;
+        }[];
+        outputs: {
+            name: string;
+            type: string;
+        }[];
+        anonymous?: undefined;
+    })[];
+    export { abi_47 as abi };
+    let networks_47: {
+        "1": {
+            address: string;
+        };
+    };
+    export { networks_47 as networks };
+}
+export namespace crvUSDView {
+    let abi_48: ({
         inputs: {
             internalType: string;
             name: string;
@@ -2672,8 +2784,8 @@ export namespace crvUSDView {
         stateMutability: string;
         type: string;
     })[];
-    export { abi_46 as abi };
-    let networks_46: {
+    export { abi_48 as abi };
+    let networks_48: {
         "1": {
             address: string;
             createdBlock: number;
@@ -2682,10 +2794,10 @@ export namespace crvUSDView {
             };
         };
     };
-    export { networks_46 as networks };
+    export { networks_48 as networks };
 }
 export namespace crvUSDFactory {
-    let abi_47: ({
+    let abi_49: ({
         name: string;
         inputs: {
             name: string;
@@ -2720,16 +2832,16 @@ export namespace crvUSDFactory {
         }[];
         anonymous?: undefined;
     })[];
-    export { abi_47 as abi };
-    let networks_47: {
+    export { abi_49 as abi };
+    let networks_49: {
         "1": {
             address: string;
         };
     };
-    export { networks_47 as networks };
+    export { networks_49 as networks };
 }
 export namespace LiquityView {
-    let abi_48: {
+    let abi_50: {
         inputs: {
             internalType: string;
             name: string;
@@ -2744,8 +2856,8 @@ export namespace LiquityView {
         stateMutability: string;
         type: string;
     }[];
-    export { abi_48 as abi };
-    let networks_48: {
+    export { abi_50 as abi };
+    let networks_50: {
         "1": {
             address: string;
             createdBlock: number;
@@ -2757,10 +2869,10 @@ export namespace LiquityView {
             };
         };
     };
-    export { networks_48 as networks };
+    export { networks_50 as networks };
 }
 export namespace CollSurplusPool {
-    let abi_49: ({
+    let abi_51: ({
         anonymous: boolean;
         inputs: {
             indexed: boolean;
@@ -2795,16 +2907,16 @@ export namespace CollSurplusPool {
         name?: undefined;
         outputs?: undefined;
     })[];
-    export { abi_49 as abi };
-    let networks_49: {
+    export { abi_51 as abi };
+    let networks_51: {
         "1": {
             address: string;
         };
     };
-    export { networks_49 as networks };
+    export { networks_51 as networks };
 }
 export namespace TroveManager {
-    let abi_50: ({
+    let abi_52: ({
         anonymous: boolean;
         inputs: {
             indexed: boolean;
@@ -2832,16 +2944,16 @@ export namespace TroveManager {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_50 as abi };
-    let networks_50: {
+    export { abi_52 as abi };
+    let networks_52: {
         "1": {
             address: string;
         };
     };
-    export { networks_50 as networks };
+    export { networks_52 as networks };
 }
 export namespace PriceFeed {
-    let abi_51: ({
+    let abi_53: ({
         anonymous: boolean;
         inputs: {
             indexed: boolean;
@@ -2876,16 +2988,16 @@ export namespace PriceFeed {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_51 as abi };
-    let networks_51: {
+    export { abi_53 as abi };
+    let networks_53: {
         "1": {
             address: string;
         };
     };
-    export { networks_51 as networks };
+    export { networks_53 as networks };
 }
 export namespace LiquityActivePool {
-    let abi_52: {
+    let abi_54: {
         inputs: never[];
         name: string;
         outputs: {
@@ -2896,16 +3008,16 @@ export namespace LiquityActivePool {
         stateMutability: string;
         type: string;
     }[];
-    export { abi_52 as abi };
-    let networks_52: {
+    export { abi_54 as abi };
+    let networks_54: {
         "1": {
             address: string;
         };
     };
-    export { networks_52 as networks };
+    export { networks_54 as networks };
 }
 export namespace McdView {
-    let abi_53: {
+    let abi_55: {
         inputs: {
             internalType: string;
             name: string;
@@ -2920,8 +3032,8 @@ export namespace McdView {
         stateMutability: string;
         type: string;
     }[];
-    export { abi_53 as abi };
-    let networks_53: {
+    export { abi_55 as abi };
+    let networks_55: {
         "1": {
             address: string;
             createdBlock: number;
@@ -2930,10 +3042,10 @@ export namespace McdView {
             };
         };
     };
-    export { networks_53 as networks };
+    export { networks_55 as networks };
 }
 export namespace McdSpotter {
-    let abi_54: {
+    let abi_56: {
         constant: boolean;
         inputs: {
             name: string;
@@ -2948,16 +3060,16 @@ export namespace McdSpotter {
         stateMutability: string;
         type: string;
     }[];
-    export { abi_54 as abi };
-    let networks_54: {
+    export { abi_56 as abi };
+    let networks_56: {
         "1": {
             address: string;
         };
     };
-    export { networks_54 as networks };
+    export { networks_56 as networks };
 }
 export namespace McdVat {
-    let abi_55: ({
+    let abi_57: ({
         inputs: never[];
         payable: boolean;
         stateMutability: string;
@@ -2998,16 +3110,16 @@ export namespace McdVat {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_55 as abi };
-    let networks_55: {
+    export { abi_57 as abi };
+    let networks_57: {
         "1": {
             address: string;
         };
     };
-    export { networks_55 as networks };
+    export { networks_57 as networks };
 }
 export namespace McdJug {
-    let abi_56: ({
+    let abi_58: ({
         inputs: {
             internalType: string;
             name: string;
@@ -3052,16 +3164,16 @@ export namespace McdJug {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_56 as abi };
-    let networks_56: {
+    export { abi_58 as abi };
+    let networks_58: {
         "1": {
             address: string;
         };
     };
-    export { networks_56 as networks };
+    export { networks_58 as networks };
 }
 export namespace McdDog {
-    let abi_57: ({
+    let abi_59: ({
         inputs: {
             internalType: string;
             name: string;
@@ -3100,16 +3212,16 @@ export namespace McdDog {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_57 as abi };
-    let networks_57: {
+    export { abi_59 as abi };
+    let networks_59: {
         "1": {
             address: string;
         };
     };
-    export { networks_57 as networks };
+    export { networks_59 as networks };
 }
 export namespace ChickenBondsView {
-    let abi_58: ({
+    let abi_60: ({
         inputs: never[];
         name: string;
         outputs: {
@@ -3139,17 +3251,17 @@ export namespace ChickenBondsView {
         stateMutability: string;
         type: string;
     })[];
-    export { abi_58 as abi };
-    let networks_58: {
+    export { abi_60 as abi };
+    let networks_60: {
         "1": {
             address: string;
             createdBlock: number;
         };
     };
-    export { networks_58 as networks };
+    export { networks_60 as networks };
 }
 export namespace ChickenBondsManager {
-    let abi_59: {
+    let abi_61: {
         inputs: {
             internalType: string;
             name: string;
@@ -3164,16 +3276,16 @@ export namespace ChickenBondsManager {
         stateMutability: string;
         type: string;
     }[];
-    export { abi_59 as abi };
-    let networks_59: {
+    export { abi_61 as abi };
+    let networks_61: {
         "1": {
             address: string;
         };
     };
-    export { networks_59 as networks };
+    export { networks_61 as networks };
 }
 export namespace COMPPriceFeed {
-    let abi_60: ({
+    let abi_62: ({
         inputs: {
             internalType: string;
             name: string;
@@ -3212,16 +3324,16 @@ export namespace COMPPriceFeed {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_60 as abi };
-    let networks_60: {
+    export { abi_62 as abi };
+    let networks_62: {
         "1": {
             address: string;
         };
     };
-    export { networks_60 as networks };
+    export { networks_62 as networks };
 }
 export namespace ETHPriceFeed {
-    let abi_61: ({
+    let abi_63: ({
         inputs: {
             internalType: string;
             name: string;
@@ -3260,16 +3372,16 @@ export namespace ETHPriceFeed {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_61 as abi };
-    let networks_61: {
+    export { abi_63 as abi };
+    let networks_63: {
         "1": {
             address: string;
         };
     };
-    export { networks_61 as networks };
+    export { networks_63 as networks };
 }
 export namespace USDCPriceFeed {
-    let abi_62: ({
+    let abi_64: ({
         inputs: {
             internalType: string;
             name: string;
@@ -3308,11 +3420,11 @@ export namespace USDCPriceFeed {
         type: string;
         anonymous?: undefined;
     })[];
-    export { abi_62 as abi };
-    let networks_62: {
+    export { abi_64 as abi };
+    let networks_64: {
         "1": {
             address: string;
         };
     };
-    export { networks_62 as networks };
+    export { networks_64 as networks };
 }