@defisaver/positions-sdk 1.0.26-dev-portfolio-9 → 1.0.26-dev-portfolio-11

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 (9) hide show
  1. package/cjs/fluid/index.d.ts +2 -2
  2. package/cjs/fluid/index.js +13 -9
  3. package/cjs/types/fluid.d.ts +1 -0
  4. package/esm/fluid/index.d.ts +2 -2
  5. package/esm/fluid/index.js +13 -9
  6. package/esm/types/fluid.d.ts +1 -0
  7. package/package.json +1 -1
  8. package/src/fluid/index.ts +12 -6
  9. package/src/types/fluid.ts +1 -0
package/cjs/fluid/index.d.ts CHANGED
@@ -119,7 +119,6 @@ export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProv
119
119
  export declare const _getUserPositions: (provider: PublicClient, network: NetworkNumber, user: EthAddress) => Promise<{
120
120
  marketData: FluidMarketData;
121
121
  userData: {
122
- nftId: bigint;
123
122
  suppliedUsd: string;
124
123
  borrowedUsd: string;
125
124
  borrowLimitUsd: string;
@@ -145,12 +144,12 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
145
144
  lastUpdated: number;
146
145
  supplyShares?: string;
147
146
  borrowShares?: string;
147
+ nftId: string;
148
148
  };
149
149
  }[]>;
150
150
  export declare const getUserPositions: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<{
151
151
  marketData: FluidMarketData;
152
152
  userData: {
153
- nftId: bigint;
154
153
  suppliedUsd: string;
155
154
  borrowedUsd: string;
156
155
  borrowLimitUsd: string;
@@ -176,5 +175,6 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
176
175
  lastUpdated: number;
177
176
  supplyShares?: string;
178
177
  borrowShares?: string;
178
+ nftId: string;
179
179
  };
180
180
  }[]>;
package/cjs/fluid/index.js CHANGED
@@ -142,11 +142,15 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
142
142
  }
143
143
  default:
144
144
  // @ts-ignore
145
- if (!results[i + offset].result[1])
146
- acc[token] = '0';
147
- // @ts-ignore
148
- else
145
+ if (results[i + offset].result[1]) {
146
+ // @ts-ignore
149
147
  acc[token] = new decimal_js_1.default(results[i + offset].result[1].toString()).div(1e8).toString();
148
+ }
149
+ else if (results[i + offset].result) {
150
+ acc[token] = new decimal_js_1.default(results[i + offset].result.toString()).div(1e8).toString();
151
+ }
152
+ else
153
+ acc[token] = '0';
150
154
  break;
151
155
  }
152
156
  return acc;
@@ -757,7 +761,7 @@ const parseT1UserData = (userPositionData, vaultData) => {
757
761
  [collAsset.symbol]: collUsedAsset,
758
762
  [debtAsset.symbol]: debtUsedAsset,
759
763
  };
760
- return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), (0, fluidHelpers_1.getFluidAggregatedData)({
764
+ return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets, nftId: userPositionData.nftId.toString() }), (0, fluidHelpers_1.getFluidAggregatedData)({
761
765
  usedAssets,
762
766
  assetsData,
763
767
  marketData,
@@ -803,7 +807,7 @@ const parseT2UserData = (userPositionData, vaultData) => {
803
807
  return acc;
804
808
  }, {});
805
809
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
806
- supplyShares }), (0, fluidHelpers_1.getFluidAggregatedData)({
810
+ supplyShares, nftId: userPositionData.nftId.toString() }), (0, fluidHelpers_1.getFluidAggregatedData)({
807
811
  usedAssets,
808
812
  assetsData,
809
813
  marketData,
@@ -848,7 +852,7 @@ const parseT3UserData = (userPositionData, vaultData) => {
848
852
  return acc;
849
853
  }, {});
850
854
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
851
- borrowShares }), (0, fluidHelpers_1.getFluidAggregatedData)({
855
+ borrowShares, nftId: userPositionData.nftId.toString() }), (0, fluidHelpers_1.getFluidAggregatedData)({
852
856
  usedAssets,
853
857
  assetsData,
854
858
  marketData,
@@ -905,7 +909,7 @@ const parseT4UserData = (userPositionData, vaultData) => {
905
909
  }, {});
906
910
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
907
911
  supplyShares,
908
- borrowShares }), (0, fluidHelpers_1.getFluidAggregatedData)({
912
+ borrowShares, nftId: userPositionData.nftId.toString() }), (0, fluidHelpers_1.getFluidAggregatedData)({
909
913
  usedAssets,
910
914
  assetsData,
911
915
  marketData,
@@ -1044,7 +1048,7 @@ const _getUserPositions = (provider, network, user) => __awaiter(void 0, void 0,
1044
1048
  const view = (0, contracts_1.FluidViewContractViem)(provider, network);
1045
1049
  const data = yield view.read.getUserPositions([user]);
1046
1050
  const parsedMarketData = yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); })));
1047
- const userData = data[0].map((position, i) => (Object.assign(Object.assign({}, parseUserData(position, parsedMarketData[i])), { nftId: position.nftId })));
1051
+ const userData = data[0].map((position, i) => (Object.assign({}, parseUserData(position, parsedMarketData[i]))));
1048
1052
  return parsedMarketData.map((market, i) => ({
1049
1053
  marketData: market,
1050
1054
  userData: userData[i],
package/cjs/types/fluid.d.ts CHANGED
@@ -308,6 +308,7 @@ export interface BaseFluidVaultData {
308
308
  lastUpdated: number;
309
309
  supplyShares?: string;
310
310
  borrowShares?: string;
311
+ nftId: string;
311
312
  }
312
313
  export type FluidVaultData = FluidAggregatedVaultData & BaseFluidVaultData;
313
314
  export interface FluidDexSupplyDataStructOutput {
package/esm/fluid/index.d.ts CHANGED
@@ -119,7 +119,6 @@ export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProv
119
119
  export declare const _getUserPositions: (provider: PublicClient, network: NetworkNumber, user: EthAddress) => Promise<{
120
120
  marketData: FluidMarketData;
121
121
  userData: {
122
- nftId: bigint;
123
122
  suppliedUsd: string;
124
123
  borrowedUsd: string;
125
124
  borrowLimitUsd: string;
@@ -145,12 +144,12 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
145
144
  lastUpdated: number;
146
145
  supplyShares?: string;
147
146
  borrowShares?: string;
147
+ nftId: string;
148
148
  };
149
149
  }[]>;
150
150
  export declare const getUserPositions: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<{
151
151
  marketData: FluidMarketData;
152
152
  userData: {
153
- nftId: bigint;
154
153
  suppliedUsd: string;
155
154
  borrowedUsd: string;
156
155
  borrowLimitUsd: string;
@@ -176,5 +175,6 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
176
175
  lastUpdated: number;
177
176
  supplyShares?: string;
178
177
  borrowShares?: string;
178
+ nftId: string;
179
179
  };
180
180
  }[]>;
package/esm/fluid/index.js CHANGED
@@ -136,11 +136,15 @@ const getChainLinkPricesForTokens = (tokens, network, client) => __awaiter(void
136
136
  }
137
137
  default:
138
138
  // @ts-ignore
139
- if (!results[i + offset].result[1])
140
- acc[token] = '0';
141
- // @ts-ignore
142
- else
139
+ if (results[i + offset].result[1]) {
140
+ // @ts-ignore
143
141
  acc[token] = new Dec(results[i + offset].result[1].toString()).div(1e8).toString();
142
+ }
143
+ else if (results[i + offset].result) {
144
+ acc[token] = new Dec(results[i + offset].result.toString()).div(1e8).toString();
145
+ }
146
+ else
147
+ acc[token] = '0';
144
148
  break;
145
149
  }
146
150
  return acc;
@@ -751,7 +755,7 @@ const parseT1UserData = (userPositionData, vaultData) => {
751
755
  [collAsset.symbol]: collUsedAsset,
752
756
  [debtAsset.symbol]: debtUsedAsset,
753
757
  };
754
- return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), getFluidAggregatedData({
758
+ return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets, nftId: userPositionData.nftId.toString() }), getFluidAggregatedData({
755
759
  usedAssets,
756
760
  assetsData,
757
761
  marketData,
@@ -797,7 +801,7 @@ const parseT2UserData = (userPositionData, vaultData) => {
797
801
  return acc;
798
802
  }, {});
799
803
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
800
- supplyShares }), getFluidAggregatedData({
804
+ supplyShares, nftId: userPositionData.nftId.toString() }), getFluidAggregatedData({
801
805
  usedAssets,
802
806
  assetsData,
803
807
  marketData,
@@ -842,7 +846,7 @@ const parseT3UserData = (userPositionData, vaultData) => {
842
846
  return acc;
843
847
  }, {});
844
848
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
845
- borrowShares }), getFluidAggregatedData({
849
+ borrowShares, nftId: userPositionData.nftId.toString() }), getFluidAggregatedData({
846
850
  usedAssets,
847
851
  assetsData,
848
852
  marketData,
@@ -899,7 +903,7 @@ const parseT4UserData = (userPositionData, vaultData) => {
899
903
  }, {});
900
904
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
901
905
  supplyShares,
902
- borrowShares }), getFluidAggregatedData({
906
+ borrowShares, nftId: userPositionData.nftId.toString() }), getFluidAggregatedData({
903
907
  usedAssets,
904
908
  assetsData,
905
909
  marketData,
@@ -1022,7 +1026,7 @@ export const _getUserPositions = (provider, network, user) => __awaiter(void 0,
1022
1026
  const view = FluidViewContractViem(provider, network);
1023
1027
  const data = yield view.read.getUserPositions([user]);
1024
1028
  const parsedMarketData = yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); })));
1025
- const userData = data[0].map((position, i) => (Object.assign(Object.assign({}, parseUserData(position, parsedMarketData[i])), { nftId: position.nftId })));
1029
+ const userData = data[0].map((position, i) => (Object.assign({}, parseUserData(position, parsedMarketData[i]))));
1026
1030
  return parsedMarketData.map((market, i) => ({
1027
1031
  marketData: market,
1028
1032
  userData: userData[i],
package/esm/types/fluid.d.ts CHANGED
@@ -308,6 +308,7 @@ export interface BaseFluidVaultData {
308
308
  lastUpdated: number;
309
309
  supplyShares?: string;
310
310
  borrowShares?: string;
311
+ nftId: string;
311
312
  }
312
313
  export type FluidVaultData = FluidAggregatedVaultData & BaseFluidVaultData;
313
314
  export interface FluidDexSupplyDataStructOutput {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "1.0.26-dev-portfolio-9",
3
+ "version": "1.0.26-dev-portfolio-11",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/fluid/index.ts CHANGED
@@ -189,9 +189,12 @@ const getChainLinkPricesForTokens = async (
189
189
 
190
190
  default:
191
191
  // @ts-ignore
192
- if (!results[i + offset].result[1]) acc[token] = '0';
193
- // @ts-ignore
194
- else acc[token] = new Dec(results[i + offset].result[1]!.toString() as string).div(1e8).toString();
192
+ if (results[i + offset].result[1]) {
193
+ // @ts-ignore
194
+ acc[token] = new Dec(results[i + offset].result[1]!.toString() as string).div(1e8).toString();
195
+ } else if (results[i + offset].result) {
196
+ acc[token] = new Dec(results[i + offset].result!.toString() as string).div(1e8).toString();
197
+ } else acc[token] = '0';
195
198
  break;
196
199
  }
197
200
  return acc;
@@ -999,6 +1002,7 @@ const parseT1UserData = (userPositionData: FluidUserPositionStructOutputStruct,
999
1002
  return {
1000
1003
  ...payload,
1001
1004
  usedAssets,
1005
+ nftId: userPositionData.nftId.toString(),
1002
1006
  ...(getFluidAggregatedData({
1003
1007
  usedAssets,
1004
1008
  assetsData,
@@ -1067,6 +1071,7 @@ const parseT2UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1067
1071
  ...payload,
1068
1072
  usedAssets,
1069
1073
  supplyShares,
1074
+ nftId: userPositionData.nftId.toString(),
1070
1075
  ...(getFluidAggregatedData({
1071
1076
  usedAssets,
1072
1077
  assetsData,
@@ -1135,6 +1140,7 @@ const parseT3UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1135
1140
  ...payload,
1136
1141
  usedAssets,
1137
1142
  borrowShares,
1143
+ nftId: userPositionData.nftId.toString(),
1138
1144
  ...(getFluidAggregatedData({
1139
1145
  usedAssets,
1140
1146
  assetsData,
@@ -1155,7 +1161,6 @@ const parseT4UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1155
1161
  ...EMPTY_FLUID_DATA,
1156
1162
  lastUpdated: Date.now(),
1157
1163
  };
1158
-
1159
1164
  const collAsset0 = getAssetInfo(marketData.collAsset0);
1160
1165
  const collAsset1 = getAssetInfo(marketData.collAsset1);
1161
1166
  const debtAsset0 = getAssetInfo(marketData.debtAsset0);
@@ -1214,6 +1219,7 @@ const parseT4UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1214
1219
  usedAssets,
1215
1220
  supplyShares,
1216
1221
  borrowShares,
1222
+ nftId: userPositionData.nftId.toString(),
1217
1223
  ...(getFluidAggregatedData({
1218
1224
  usedAssets,
1219
1225
  assetsData,
@@ -1222,7 +1228,7 @@ const parseT4UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1222
1228
  };
1223
1229
  };
1224
1230
 
1225
- const parseUserData = (userPositionData: FluidUserPositionStructOutputStruct, vaultData: FluidMarketData) => {
1231
+ const parseUserData = (userPositionData: FluidUserPositionStructOutputStruct, vaultData: FluidMarketData): FluidVaultData => {
1226
1232
  const vaultType = vaultData.marketData.vaultType;
1227
1233
  switch (vaultType) {
1228
1234
  case FluidVaultType.T1:
@@ -1425,7 +1431,7 @@ export const _getUserPositions = async (provider: PublicClient, network: Network
1425
1431
 
1426
1432
  const parsedMarketData = await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network)));
1427
1433
 
1428
- const userData = data[0].map((position, i) => ({ ...parseUserData(position, parsedMarketData[i]), nftId: position.nftId }));
1434
+ const userData = data[0].map((position, i) => ({ ...parseUserData(position, parsedMarketData[i]) }));
1429
1435
 
1430
1436
  return parsedMarketData.map((market, i) => ({
1431
1437
  marketData: market,
package/src/types/fluid.ts CHANGED
@@ -326,6 +326,7 @@ export interface BaseFluidVaultData {
326
326
  lastUpdated: number,
327
327
  supplyShares?: string;
328
328
  borrowShares?: string;
329
+ nftId: string;
329
330
  }
330
331
 
331
332
  export type FluidVaultData = FluidAggregatedVaultData & BaseFluidVaultData;