@1delta/margin-fetcher 0.0.17 → 0.0.18

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 (11) hide show
  1. package/dist/lending/user-data/aave-v3-type/userCallParse.d.ts.map +1 -1
  2. package/dist/lending/user-data/fetchUserData.d.ts.map +1 -1
  3. package/dist/lending/user-data/fetchUserData.js +1 -3
  4. package/dist/lending/user-data/morpho/userCallParse.d.ts.map +1 -1
  5. package/dist/lending/user-data/morpho/userCallParse.js +2 -1
  6. package/package.json +1 -1
  7. package/src/lending/user-data/aave-v3-type/userCallParse.ts +2 -0
  8. package/src/lending/user-data/fetchUserData.ts +1 -4
  9. package/src/lending/user-data/morpho/userCallParse.ts +2 -1
  10. package/test/data.ts +47979 -0
  11. package/test/userDataAll.test.ts +32 -41
package/dist/lending/user-data/aave-v3-type/userCallParse.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v3-type/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAKpD,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,yBAAyB,GAAG,SAAS,EAAE,MAAM,CAmDjE,CAAA"}
1
+ {"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v3-type/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAKpD,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,yBAAyB,GAAG,SAAS,EAAE,MAAM,CAqDjE,CAAA"}
package/dist/lending/user-data/fetchUserData.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,KACjC,OAAO,CAAC,GAAG,EAAE,CA4Bf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CA0CzB,CAAA"}
1
+ {"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,KACjC,OAAO,CAAC,GAAG,EAAE,CA4Bf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAuCzB,CAAA"}
package/dist/lending/user-data/fetchUserData.js CHANGED
@@ -91,9 +91,7 @@ export const convertLenderUserDataResult = (chainId, queriesRaw, rawResults, pri
91
91
  }
92
92
  }
93
93
  }
94
- catch (e) {
95
- console.log('Error parsing for', query.lender, 'on', chainId, e);
96
- }
94
+ catch (e) { }
97
95
  currentSlice += sliceLength;
98
96
  }
99
97
  return lenderData;
package/dist/lending/user-data/morpho/userCallParse.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AA+CpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CA8EP,CAAA"}
1
+ {"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AA+CpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CA+EP,CAAA"}
package/dist/lending/user-data/morpho/userCallParse.js CHANGED
@@ -77,7 +77,8 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
77
77
  id: market.id,
78
78
  };
79
79
  }
80
- for (const [marketId, pubData] of Object.entries(lenderData ?? {})) {
80
+ for (const marketId of markets) {
81
+ const pubData = lenderData[marketId];
81
82
  if (marketsHandled.includes(marketId))
82
83
  continue;
83
84
  const payload = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@1delta/margin-fetcher",
3
- "version": "0.0.17",
3
+ "version": "0.0.18",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/lending/user-data/aave-v3-type/userCallParse.ts CHANGED
@@ -16,11 +16,13 @@ export const getAaveV3UserDataConverter = (
16
16
 
17
17
  const assetsToQuery = getAaveAssets(chainId, lender)
18
18
  const expectedNumberOfCalls = assetsToQuery.length + 1
19
+
19
20
  return [
20
21
  (data: any[]) => {
21
22
  if (data.length !== expectedNumberOfCalls) {
22
23
  return undefined
23
24
  }
25
+
24
26
  const userEMode = Number(data[expectedNumberOfCalls - 1])
25
27
  const lendingPositions: { [asset: string]: any } = {}
26
28
 
package/src/lending/user-data/fetchUserData.ts CHANGED
@@ -195,11 +195,8 @@ export const convertLenderUserDataResult = (
195
195
  }
196
196
  }
197
197
  }
198
- } catch (e) {
199
- console.log('Error parsing for', query.lender, 'on', chainId, e)
200
- }
198
+ } catch (e) {}
201
199
  currentSlice += sliceLength
202
200
  }
203
-
204
201
  return lenderData
205
202
  }
package/src/lending/user-data/morpho/userCallParse.ts CHANGED
@@ -112,7 +112,8 @@ export const getMorphoUserDataConverterWithlens = (
112
112
  }
113
113
  }
114
114
 
115
- for (const [marketId, pubData] of Object.entries(lenderData ?? {})) {
115
+ for (const marketId of markets) {
116
+ const pubData = lenderData[marketId]
116
117
  if (marketsHandled.includes(marketId)) continue;
117
118
  const payload = {
118
119
  chainId,