@defisaver/positions-sdk 1.0.26-dev-portfolio-10 → 1.0.26-dev-portfolio-12

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 +5 -5
  3. package/cjs/types/fluid.d.ts +1 -0
  4. package/esm/fluid/index.d.ts +2 -2
  5. package/esm/fluid/index.js +5 -5
  6. package/esm/types/fluid.d.ts +1 -0
  7. package/package.json +1 -1
  8. package/src/fluid/index.ts +6 -2
  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
@@ -761,7 +761,7 @@ const parseT1UserData = (userPositionData, vaultData) => {
761
761
  [collAsset.symbol]: collUsedAsset,
762
762
  [debtAsset.symbol]: debtUsedAsset,
763
763
  };
764
- 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)({
765
765
  usedAssets,
766
766
  assetsData,
767
767
  marketData,
@@ -807,7 +807,7 @@ const parseT2UserData = (userPositionData, vaultData) => {
807
807
  return acc;
808
808
  }, {});
809
809
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
810
- supplyShares }), (0, fluidHelpers_1.getFluidAggregatedData)({
810
+ supplyShares, nftId: userPositionData.nftId.toString() }), (0, fluidHelpers_1.getFluidAggregatedData)({
811
811
  usedAssets,
812
812
  assetsData,
813
813
  marketData,
@@ -852,7 +852,7 @@ const parseT3UserData = (userPositionData, vaultData) => {
852
852
  return acc;
853
853
  }, {});
854
854
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
855
- borrowShares }), (0, fluidHelpers_1.getFluidAggregatedData)({
855
+ borrowShares, nftId: userPositionData.nftId.toString() }), (0, fluidHelpers_1.getFluidAggregatedData)({
856
856
  usedAssets,
857
857
  assetsData,
858
858
  marketData,
@@ -909,7 +909,7 @@ const parseT4UserData = (userPositionData, vaultData) => {
909
909
  }, {});
910
910
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
911
911
  supplyShares,
912
- borrowShares }), (0, fluidHelpers_1.getFluidAggregatedData)({
912
+ borrowShares, nftId: userPositionData.nftId.toString() }), (0, fluidHelpers_1.getFluidAggregatedData)({
913
913
  usedAssets,
914
914
  assetsData,
915
915
  marketData,
@@ -1048,7 +1048,7 @@ const _getUserPositions = (provider, network, user) => __awaiter(void 0, void 0,
1048
1048
  const view = (0, contracts_1.FluidViewContractViem)(provider, network);
1049
1049
  const data = yield view.read.getUserPositions([user]);
1050
1050
  const parsedMarketData = yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); })));
1051
- 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]))));
1052
1052
  return parsedMarketData.map((market, i) => ({
1053
1053
  marketData: market,
1054
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
@@ -755,7 +755,7 @@ const parseT1UserData = (userPositionData, vaultData) => {
755
755
  [collAsset.symbol]: collUsedAsset,
756
756
  [debtAsset.symbol]: debtUsedAsset,
757
757
  };
758
- 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({
759
759
  usedAssets,
760
760
  assetsData,
761
761
  marketData,
@@ -801,7 +801,7 @@ const parseT2UserData = (userPositionData, vaultData) => {
801
801
  return acc;
802
802
  }, {});
803
803
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
804
- supplyShares }), getFluidAggregatedData({
804
+ supplyShares, nftId: userPositionData.nftId.toString() }), getFluidAggregatedData({
805
805
  usedAssets,
806
806
  assetsData,
807
807
  marketData,
@@ -846,7 +846,7 @@ const parseT3UserData = (userPositionData, vaultData) => {
846
846
  return acc;
847
847
  }, {});
848
848
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
849
- borrowShares }), getFluidAggregatedData({
849
+ borrowShares, nftId: userPositionData.nftId.toString() }), getFluidAggregatedData({
850
850
  usedAssets,
851
851
  assetsData,
852
852
  marketData,
@@ -903,7 +903,7 @@ const parseT4UserData = (userPositionData, vaultData) => {
903
903
  }, {});
904
904
  return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
905
905
  supplyShares,
906
- borrowShares }), getFluidAggregatedData({
906
+ borrowShares, nftId: userPositionData.nftId.toString() }), getFluidAggregatedData({
907
907
  usedAssets,
908
908
  assetsData,
909
909
  marketData,
@@ -1026,7 +1026,7 @@ export const _getUserPositions = (provider, network, user) => __awaiter(void 0,
1026
1026
  const view = FluidViewContractViem(provider, network);
1027
1027
  const data = yield view.read.getUserPositions([user]);
1028
1028
  const parsedMarketData = yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); })));
1029
- 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]))));
1030
1030
  return parsedMarketData.map((market, i) => ({
1031
1031
  marketData: market,
1032
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-10",
3
+ "version": "1.0.26-dev-portfolio-12",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/fluid/index.ts CHANGED
@@ -1002,6 +1002,7 @@ const parseT1UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1002
1002
  return {
1003
1003
  ...payload,
1004
1004
  usedAssets,
1005
+ nftId: userPositionData.nftId.toString(),
1005
1006
  ...(getFluidAggregatedData({
1006
1007
  usedAssets,
1007
1008
  assetsData,
@@ -1070,6 +1071,7 @@ const parseT2UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1070
1071
  ...payload,
1071
1072
  usedAssets,
1072
1073
  supplyShares,
1074
+ nftId: userPositionData.nftId.toString(),
1073
1075
  ...(getFluidAggregatedData({
1074
1076
  usedAssets,
1075
1077
  assetsData,
@@ -1138,6 +1140,7 @@ const parseT3UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1138
1140
  ...payload,
1139
1141
  usedAssets,
1140
1142
  borrowShares,
1143
+ nftId: userPositionData.nftId.toString(),
1141
1144
  ...(getFluidAggregatedData({
1142
1145
  usedAssets,
1143
1146
  assetsData,
@@ -1216,6 +1219,7 @@ const parseT4UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1216
1219
  usedAssets,
1217
1220
  supplyShares,
1218
1221
  borrowShares,
1222
+ nftId: userPositionData.nftId.toString(),
1219
1223
  ...(getFluidAggregatedData({
1220
1224
  usedAssets,
1221
1225
  assetsData,
@@ -1224,7 +1228,7 @@ const parseT4UserData = (userPositionData: FluidUserPositionStructOutputStruct,
1224
1228
  };
1225
1229
  };
1226
1230
 
1227
- const parseUserData = (userPositionData: FluidUserPositionStructOutputStruct, vaultData: FluidMarketData) => {
1231
+ const parseUserData = (userPositionData: FluidUserPositionStructOutputStruct, vaultData: FluidMarketData): FluidVaultData => {
1228
1232
  const vaultType = vaultData.marketData.vaultType;
1229
1233
  switch (vaultType) {
1230
1234
  case FluidVaultType.T1:
@@ -1427,7 +1431,7 @@ export const _getUserPositions = async (provider: PublicClient, network: Network
1427
1431
 
1428
1432
  const parsedMarketData = await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network)));
1429
1433
 
1430
- 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]) }));
1431
1435
 
1432
1436
  return parsedMarketData.map((market, i) => ({
1433
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;