@defisaver/positions-sdk 0.0.1 → 0.0.3

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.
Files changed (14) hide show
  1. package/cjs/compoundV3/index.js +1 -1
  2. package/cjs/helpers/aaveHelpers/index.d.ts +1 -1
  3. package/cjs/helpers/aaveHelpers/index.js +3 -14
  4. package/cjs/helpers/sparkHelpers/index.d.ts +1 -1
  5. package/cjs/helpers/sparkHelpers/index.js +3 -9
  6. package/esm/compoundV3/index.js +1 -1
  7. package/esm/helpers/aaveHelpers/index.d.ts +1 -1
  8. package/esm/helpers/aaveHelpers/index.js +3 -14
  9. package/esm/helpers/sparkHelpers/index.d.ts +1 -1
  10. package/esm/helpers/sparkHelpers/index.js +3 -9
  11. package/package.json +3 -3
  12. package/src/compoundV3/index.ts +1 -1
  13. package/src/helpers/aaveHelpers/index.ts +3 -20
  14. package/src/helpers/sparkHelpers/index.ts +2 -14
package/cjs/compoundV3/index.js CHANGED
@@ -122,7 +122,7 @@ const getCompoundV3AccountBalances = (web3, network, block, addressMapping, addr
122
122
  [(0, compound_2.COMPOUND_V3_ETH)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_ETH)(network),
123
123
  [(0, compound_2.COMPOUND_V3_USDC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDC)(network),
124
124
  [(0, compound_2.COMPOUND_V3_USDBC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDBC)(network),
125
- })[marketAddress];
125
+ })[marketAddress.toLowerCase()];
126
126
  const loanInfoContract = (0, contracts_1.CompV3ViewContract)(web3, network, block);
127
127
  const loanInfo = yield loanInfoContract.methods.getLoanData(market.baseMarketAddress, address).call({}, block);
128
128
  const baseAssetInfo = (0, tokens_1.getAssetInfo)((0, utils_1.wethToEth)(market.baseAsset), network);
package/cjs/helpers/aaveHelpers/index.d.ts CHANGED
@@ -30,7 +30,7 @@ export declare const aaveAnyGetSuppliableAsCollAssets: ({ usedAssets, eModeCateg
30
30
  symbol: string;
31
31
  canBeCollateral: boolean;
32
32
  }[];
33
- export declare const aaveAnyGetEmodeMutableProps: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon, _asset: string) => {
33
+ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, assetsData, }: AaveHelperCommon, _asset: string) => {
34
34
  liquidationRatio: any;
35
35
  collateralFactor: any;
36
36
  };
package/cjs/helpers/aaveHelpers/index.js CHANGED
@@ -57,24 +57,13 @@ const aaveAnyGetSuppliableAsCollAssets = (_a) => {
57
57
  return (0, exports.aaveAnyGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
58
58
  };
59
59
  exports.aaveAnyGetSuppliableAsCollAssets = aaveAnyGetSuppliableAsCollAssets;
60
- const aaveAnyGetEmodeMutableProps = (_a, _asset) => {
61
- var _b;
62
- var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
63
- const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
60
+ const aaveAnyGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
61
+ var _a;
64
62
  const asset = (0, utils_1.wethToEth)(_asset);
65
- const canSupplyAsColl = (0, exports.aaveAnyGetSuppliableAsCollAssets)(data).some(({ symbol }) => symbol === asset);
66
- // TODO remove dirty fix for Morpho V2
67
- if ((0, exports.isMorphoAaveV2)({ selectedMarket }) && !canSupplyAsColl) {
68
- const { liquidationRatio, collateralFactor } = assetsData[asset];
69
- return ({ liquidationRatio, collateralFactor });
70
- }
71
- if (!canSupplyAsColl) {
72
- return ({ liquidationRatio: '0', collateralFactor: '0' });
73
- }
74
63
  const assetData = assetsData[asset];
75
64
  if (eModeCategory === 0
76
65
  || assetData.eModeCategory !== eModeCategory
77
- || new decimal_js_1.default(((_b = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _b === void 0 ? void 0 : _b.collateralFactor) || 0).eq(0)) {
66
+ || new decimal_js_1.default(((_a = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _a === void 0 ? void 0 : _a.collateralFactor) || 0).eq(0)) {
78
67
  const { liquidationRatio, collateralFactor } = assetData;
79
68
  return ({ liquidationRatio, collateralFactor });
80
69
  }
package/cjs/helpers/sparkHelpers/index.d.ts CHANGED
@@ -14,7 +14,7 @@ export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategor
14
14
  symbol: string;
15
15
  canBeCollateral: boolean;
16
16
  }[];
17
- export declare const sparkGetEmodeMutableProps: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon, _asset: string) => {
17
+ export declare const sparkGetEmodeMutableProps: ({ eModeCategory, assetsData, }: SparkHelperCommon, _asset: string) => {
18
18
  liquidationRatio: string;
19
19
  collateralFactor: string;
20
20
  };
package/cjs/helpers/sparkHelpers/index.js CHANGED
@@ -40,19 +40,13 @@ const sparkGetSuppliableAsCollAssets = (_a) => {
40
40
  return (0, exports.sparkGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
41
41
  };
42
42
  exports.sparkGetSuppliableAsCollAssets = sparkGetSuppliableAsCollAssets;
43
- const sparkGetEmodeMutableProps = (_a, _asset) => {
44
- var _b;
45
- var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
46
- const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
43
+ const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
44
+ var _a;
47
45
  const asset = (0, utils_1.wethToEth)(_asset);
48
- const canSupplyAsColl = (0, exports.sparkGetSuppliableAsCollAssets)(data).some(({ symbol }) => symbol === asset);
49
- if (!canSupplyAsColl) {
50
- return ({ liquidationRatio: '0', collateralFactor: '0' });
51
- }
52
46
  const assetData = assetsData[asset];
53
47
  if (eModeCategory === 0
54
48
  || assetData.eModeCategory !== eModeCategory
55
- || new decimal_js_1.default(((_b = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _b === void 0 ? void 0 : _b.collateralFactor) || 0).eq(0)) {
49
+ || new decimal_js_1.default(((_a = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _a === void 0 ? void 0 : _a.collateralFactor) || 0).eq(0)) {
56
50
  const { liquidationRatio, collateralFactor } = assetData;
57
51
  return ({ liquidationRatio, collateralFactor });
58
52
  }
package/esm/compoundV3/index.js CHANGED
@@ -115,7 +115,7 @@ export const getCompoundV3AccountBalances = (web3, network, block, addressMappin
115
115
  [COMPOUND_V3_ETH(network).baseMarketAddress.toLowerCase()]: COMPOUND_V3_ETH(network),
116
116
  [COMPOUND_V3_USDC(network).baseMarketAddress.toLowerCase()]: COMPOUND_V3_USDC(network),
117
117
  [COMPOUND_V3_USDBC(network).baseMarketAddress.toLowerCase()]: COMPOUND_V3_USDBC(network),
118
- })[marketAddress];
118
+ })[marketAddress.toLowerCase()];
119
119
  const loanInfoContract = CompV3ViewContract(web3, network, block);
120
120
  const loanInfo = yield loanInfoContract.methods.getLoanData(market.baseMarketAddress, address).call({}, block);
121
121
  const baseAssetInfo = getAssetInfo(wethToEth(market.baseAsset), network);
package/esm/helpers/aaveHelpers/index.d.ts CHANGED
@@ -30,7 +30,7 @@ export declare const aaveAnyGetSuppliableAsCollAssets: ({ usedAssets, eModeCateg
30
30
  symbol: string;
31
31
  canBeCollateral: boolean;
32
32
  }[];
33
- export declare const aaveAnyGetEmodeMutableProps: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon, _asset: string) => {
33
+ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, assetsData, }: AaveHelperCommon, _asset: string) => {
34
34
  liquidationRatio: any;
35
35
  collateralFactor: any;
36
36
  };
package/esm/helpers/aaveHelpers/index.js CHANGED
@@ -42,24 +42,13 @@ export const aaveAnyGetSuppliableAsCollAssets = (_a) => {
42
42
  var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
43
43
  return aaveAnyGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
44
44
  };
45
- export const aaveAnyGetEmodeMutableProps = (_a, _asset) => {
46
- var _b;
47
- var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
48
- const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
45
+ export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
46
+ var _a;
49
47
  const asset = wethToEth(_asset);
50
- const canSupplyAsColl = aaveAnyGetSuppliableAsCollAssets(data).some(({ symbol }) => symbol === asset);
51
- // TODO remove dirty fix for Morpho V2
52
- if (isMorphoAaveV2({ selectedMarket }) && !canSupplyAsColl) {
53
- const { liquidationRatio, collateralFactor } = assetsData[asset];
54
- return ({ liquidationRatio, collateralFactor });
55
- }
56
- if (!canSupplyAsColl) {
57
- return ({ liquidationRatio: '0', collateralFactor: '0' });
58
- }
59
48
  const assetData = assetsData[asset];
60
49
  if (eModeCategory === 0
61
50
  || assetData.eModeCategory !== eModeCategory
62
- || new Dec(((_b = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _b === void 0 ? void 0 : _b.collateralFactor) || 0).eq(0)) {
51
+ || new Dec(((_a = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _a === void 0 ? void 0 : _a.collateralFactor) || 0).eq(0)) {
63
52
  const { liquidationRatio, collateralFactor } = assetData;
64
53
  return ({ liquidationRatio, collateralFactor });
65
54
  }
package/esm/helpers/sparkHelpers/index.d.ts CHANGED
@@ -14,7 +14,7 @@ export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategor
14
14
  symbol: string;
15
15
  canBeCollateral: boolean;
16
16
  }[];
17
- export declare const sparkGetEmodeMutableProps: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon, _asset: string) => {
17
+ export declare const sparkGetEmodeMutableProps: ({ eModeCategory, assetsData, }: SparkHelperCommon, _asset: string) => {
18
18
  liquidationRatio: string;
19
19
  collateralFactor: string;
20
20
  };
package/esm/helpers/sparkHelpers/index.js CHANGED
@@ -30,19 +30,13 @@ export const sparkGetSuppliableAsCollAssets = (_a) => {
30
30
  var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
31
31
  return sparkGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
32
32
  };
33
- export const sparkGetEmodeMutableProps = (_a, _asset) => {
34
- var _b;
35
- var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
36
- const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
33
+ export const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
34
+ var _a;
37
35
  const asset = wethToEth(_asset);
38
- const canSupplyAsColl = sparkGetSuppliableAsCollAssets(data).some(({ symbol }) => symbol === asset);
39
- if (!canSupplyAsColl) {
40
- return ({ liquidationRatio: '0', collateralFactor: '0' });
41
- }
42
36
  const assetData = assetsData[asset];
43
37
  if (eModeCategory === 0
44
38
  || assetData.eModeCategory !== eModeCategory
45
- || new Dec(((_b = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _b === void 0 ? void 0 : _b.collateralFactor) || 0).eq(0)) {
39
+ || new Dec(((_a = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _a === void 0 ? void 0 : _a.collateralFactor) || 0).eq(0)) {
46
40
  const { liquidationRatio, collateralFactor } = assetData;
47
41
  return ({ liquidationRatio, collateralFactor });
48
42
  }
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.1",
3
+ "version": "0.0.3",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
- "module": "./esm/src/index.js",
7
- "types": "./esm/src/index.d.ts",
6
+ "module": "./esm/index.js",
7
+ "types": "./esm/index.d.ts",
8
8
  "scripts": {
9
9
  "build:esm": "rm -rf esm && tsc -p tsconfig.json",
10
10
  "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
package/src/compoundV3/index.ts CHANGED
@@ -129,7 +129,7 @@ export const getCompoundV3AccountBalances = async (web3: Web3, network: NetworkN
129
129
  [COMPOUND_V3_ETH(network).baseMarketAddress.toLowerCase()]: COMPOUND_V3_ETH(network),
130
130
  [COMPOUND_V3_USDC(network).baseMarketAddress.toLowerCase()]: COMPOUND_V3_USDC(network),
131
131
  [COMPOUND_V3_USDBC(network).baseMarketAddress.toLowerCase()]: COMPOUND_V3_USDBC(network),
132
- })[marketAddress];
132
+ })[marketAddress.toLowerCase()];
133
133
 
134
134
  const loanInfoContract = CompV3ViewContract(web3, network, block);
135
135
  const loanInfo = await loanInfoContract.methods.getLoanData(market.baseMarketAddress, address).call({}, block);
package/src/helpers/aaveHelpers/index.ts CHANGED
@@ -50,34 +50,17 @@ export const aaveAnyGetSuppliableAsCollAssets = ({
50
50
 
51
51
  export const aaveAnyGetEmodeMutableProps = (
52
52
  {
53
- usedAssets,
54
53
  eModeCategory,
55
- eModeCategories,
56
54
  assetsData,
57
- selectedMarket,
58
- network,
59
- ...rest
60
55
  }: AaveHelperCommon, _asset: string) => {
61
- const data = {
62
- usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
63
- };
64
56
  const asset = wethToEth(_asset);
65
- const canSupplyAsColl = aaveAnyGetSuppliableAsCollAssets(data).some(({ symbol }: { symbol: string }) => symbol === asset);
66
57
 
67
- // TODO remove dirty fix for Morpho V2
68
- if (isMorphoAaveV2({ selectedMarket }) && !canSupplyAsColl) {
69
- const { liquidationRatio, collateralFactor } = assetsData[asset];
70
- return ({ liquidationRatio, collateralFactor });
71
- }
72
-
73
- if (!canSupplyAsColl) {
74
- return ({ liquidationRatio: '0', collateralFactor: '0' });
75
- }
76
58
  const assetData = assetsData[asset];
59
+
77
60
  if (
78
61
  eModeCategory === 0
79
- || assetData.eModeCategory !== eModeCategory
80
- || new Dec(assetData?.eModeCategoryData?.collateralFactor || 0).eq(0)
62
+ || assetData.eModeCategory !== eModeCategory
63
+ || new Dec(assetData?.eModeCategoryData?.collateralFactor || 0).eq(0)
81
64
  ) {
82
65
  const { liquidationRatio, collateralFactor } = assetData;
83
66
  return ({ liquidationRatio, collateralFactor });
package/src/helpers/sparkHelpers/index.ts CHANGED
@@ -36,29 +36,17 @@ export const sparkGetSuppliableAsCollAssets = ({
36
36
  }).filter(({ canBeCollateral }) => canBeCollateral);
37
37
 
38
38
  export const sparkGetEmodeMutableProps = ({
39
- usedAssets,
40
39
  eModeCategory,
41
- eModeCategories,
42
40
  assetsData,
43
- selectedMarket,
44
- network,
45
- ...rest
46
41
  }: SparkHelperCommon,
47
42
  _asset: string) => {
48
- const data = {
49
- usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
50
- };
51
43
  const asset = wethToEth(_asset);
52
- const canSupplyAsColl = sparkGetSuppliableAsCollAssets(data).some(({ symbol }) => symbol === asset);
53
44
 
54
- if (!canSupplyAsColl) {
55
- return ({ liquidationRatio: '0', collateralFactor: '0' });
56
- }
57
45
  const assetData = assetsData[asset];
58
46
  if (
59
47
  eModeCategory === 0
60
- || assetData.eModeCategory !== eModeCategory
61
- || new Dec(assetData?.eModeCategoryData?.collateralFactor || 0).eq(0)
48
+ || assetData.eModeCategory !== eModeCategory
49
+ || new Dec(assetData?.eModeCategoryData?.collateralFactor || 0).eq(0)
62
50
  ) {
63
51
  const { liquidationRatio, collateralFactor } = assetData;
64
52
  return ({ liquidationRatio, collateralFactor });