@defisaver/positions-sdk 2.1.59 → 2.1.60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/helpers/morphoBlueHelpers/index.js +2 -2
- package/cjs/services/utils.d.ts +1 -0
- package/cjs/services/utils.js +2 -1
- package/esm/helpers/morphoBlueHelpers/index.js +3 -3
- package/esm/services/utils.d.ts +1 -0
- package/esm/services/utils.js +1 -0
- package/package.json +1 -1
- package/src/helpers/morphoBlueHelpers/index.ts +3 -3
- package/src/services/utils.ts +1 -0
|
@@ -222,7 +222,7 @@ const getReallocatableLiquidity = (marketId_1, ...args_1) => __awaiter(void 0, [
|
|
|
222
222
|
query: MARKET_QUERY,
|
|
223
223
|
variables: { uniqueKey: marketId, chainId: network },
|
|
224
224
|
}),
|
|
225
|
-
signal: AbortSignal.timeout(utils_1.
|
|
225
|
+
signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
|
|
226
226
|
});
|
|
227
227
|
const data = yield response.json();
|
|
228
228
|
const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
|
|
@@ -286,7 +286,7 @@ const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...args_1) =>
|
|
|
286
286
|
query: MARKET_QUERY,
|
|
287
287
|
variables: { uniqueKey: marketId, chainId: network },
|
|
288
288
|
}),
|
|
289
|
-
signal: AbortSignal.timeout(utils_1.
|
|
289
|
+
signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
|
|
290
290
|
});
|
|
291
291
|
const data = yield response.json();
|
|
292
292
|
const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
|
package/cjs/services/utils.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export declare const MAXUINT: string;
|
|
|
21
21
|
export declare const isMaxuint: (amount: string) => boolean;
|
|
22
22
|
export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;
|
|
23
23
|
export declare const DEFAULT_TIMEOUT = 2000;
|
|
24
|
+
export declare const LONGER_TIMEOUT = 5000;
|
|
24
25
|
/**
|
|
25
26
|
* Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
|
|
26
27
|
* @param value
|
package/cjs/services/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getNativeAssetFromWrapped = exports.getWrappedNativeAssetFromUnwrapped = exports.wxplToXpl = exports.xplToWxpl = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.convertHybridArraysToObjects = exports.DEFAULT_TIMEOUT = exports.isMainnetNetwork = exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.addToArrayIf = exports.addToObjectIf = exports.isLayer2Network = void 0;
|
|
6
|
+
exports.getNativeAssetFromWrapped = exports.getWrappedNativeAssetFromUnwrapped = exports.wxplToXpl = exports.xplToWxpl = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.convertHybridArraysToObjects = exports.LONGER_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.isMainnetNetwork = exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.addToArrayIf = exports.addToObjectIf = exports.isLayer2Network = void 0;
|
|
7
7
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
8
|
const tokens_1 = require("@defisaver/tokens");
|
|
9
9
|
const common_1 = require("../types/common");
|
|
@@ -56,6 +56,7 @@ exports.isMaxuint = isMaxuint;
|
|
|
56
56
|
const isMainnetNetwork = (network) => network === common_1.NetworkNumber.Eth;
|
|
57
57
|
exports.isMainnetNetwork = isMainnetNetwork;
|
|
58
58
|
exports.DEFAULT_TIMEOUT = 2000; // 2 seconds
|
|
59
|
+
exports.LONGER_TIMEOUT = 5000; // 5 seconds
|
|
59
60
|
/**
|
|
60
61
|
* Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
|
|
61
62
|
* @param value
|
|
@@ -14,7 +14,7 @@ import { calculateNetApy } from '../../staking';
|
|
|
14
14
|
import { LeverageType, NetworkNumber, } from '../../types/common';
|
|
15
15
|
import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
|
|
16
16
|
import { MorphoBlueViewContractViem } from '../../contracts';
|
|
17
|
-
import { compareAddresses,
|
|
17
|
+
import { compareAddresses, LONGER_TIMEOUT, wethToEth } from '../../services/utils';
|
|
18
18
|
import { getViemProvider } from '../../services/viem';
|
|
19
19
|
export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
|
|
20
20
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -212,7 +212,7 @@ export const getReallocatableLiquidity = (marketId_1, ...args_1) => __awaiter(vo
|
|
|
212
212
|
query: MARKET_QUERY,
|
|
213
213
|
variables: { uniqueKey: marketId, chainId: network },
|
|
214
214
|
}),
|
|
215
|
-
signal: AbortSignal.timeout(
|
|
215
|
+
signal: AbortSignal.timeout(LONGER_TIMEOUT),
|
|
216
216
|
});
|
|
217
217
|
const data = yield response.json();
|
|
218
218
|
const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
|
|
@@ -274,7 +274,7 @@ export const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...arg
|
|
|
274
274
|
query: MARKET_QUERY,
|
|
275
275
|
variables: { uniqueKey: marketId, chainId: network },
|
|
276
276
|
}),
|
|
277
|
-
signal: AbortSignal.timeout(
|
|
277
|
+
signal: AbortSignal.timeout(LONGER_TIMEOUT),
|
|
278
278
|
});
|
|
279
279
|
const data = yield response.json();
|
|
280
280
|
const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
|
package/esm/services/utils.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export declare const MAXUINT: string;
|
|
|
21
21
|
export declare const isMaxuint: (amount: string) => boolean;
|
|
22
22
|
export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;
|
|
23
23
|
export declare const DEFAULT_TIMEOUT = 2000;
|
|
24
|
+
export declare const LONGER_TIMEOUT = 5000;
|
|
24
25
|
/**
|
|
25
26
|
* Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
|
|
26
27
|
* @param value
|
package/esm/services/utils.js
CHANGED
|
@@ -34,6 +34,7 @@ export const MAXUINT = '11579208923731619542357098500868790785326998466564056403
|
|
|
34
34
|
export const isMaxuint = (amount) => compareAddresses(MAXUINT, amount);
|
|
35
35
|
export const isMainnetNetwork = (network) => network === NetworkNumber.Eth;
|
|
36
36
|
export const DEFAULT_TIMEOUT = 2000; // 2 seconds
|
|
37
|
+
export const LONGER_TIMEOUT = 5000; // 5 seconds
|
|
37
38
|
/**
|
|
38
39
|
* Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
|
|
39
40
|
* @param value
|
package/package.json
CHANGED
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
} from '../../types';
|
|
15
15
|
import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
|
|
16
16
|
import { MorphoBlueViewContractViem } from '../../contracts';
|
|
17
|
-
import { compareAddresses,
|
|
17
|
+
import { compareAddresses, LONGER_TIMEOUT, wethToEth } from '../../services/utils';
|
|
18
18
|
import { getViemProvider } from '../../services/viem';
|
|
19
19
|
|
|
20
20
|
export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }: { usedAssets: MMUsedAssets, assetsData: MorphoBlueAssetsData, marketInfo: MorphoBlueMarketInfo }): MorphoBlueAggregatedPositionData => {
|
|
@@ -231,7 +231,7 @@ export const getReallocatableLiquidity = async (marketId: string, network: Netwo
|
|
|
231
231
|
query: MARKET_QUERY,
|
|
232
232
|
variables: { uniqueKey: marketId, chainId: network },
|
|
233
233
|
}),
|
|
234
|
-
signal: AbortSignal.timeout(
|
|
234
|
+
signal: AbortSignal.timeout(LONGER_TIMEOUT),
|
|
235
235
|
});
|
|
236
236
|
|
|
237
237
|
const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
|
|
@@ -296,7 +296,7 @@ export const getReallocation = async (market: MorphoBlueMarketData, assetsData:
|
|
|
296
296
|
query: MARKET_QUERY,
|
|
297
297
|
variables: { uniqueKey: marketId, chainId: network },
|
|
298
298
|
}),
|
|
299
|
-
signal: AbortSignal.timeout(
|
|
299
|
+
signal: AbortSignal.timeout(LONGER_TIMEOUT),
|
|
300
300
|
});
|
|
301
301
|
|
|
302
302
|
const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
|
package/src/services/utils.ts
CHANGED
|
@@ -54,6 +54,7 @@ export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
|
|
|
54
54
|
export const isMainnetNetwork = (network: NetworkNumber) => network === NetworkNumber.Eth;
|
|
55
55
|
|
|
56
56
|
export const DEFAULT_TIMEOUT = 2000; // 2 seconds
|
|
57
|
+
export const LONGER_TIMEOUT = 5000; // 5 seconds
|
|
57
58
|
|
|
58
59
|
/**
|
|
59
60
|
* Converts web3 hybrid response (that can be used as objects and arrays, so has duplicated values) to objects.
|