@sonarwatch/portfolio-plugins 0.11.210 → 0.11.212

Sign up to get free protection for your applications and to get access to all the features.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,19 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [0.11.212](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.211...plugins-0.11.212) (2024-05-23)
6
+
7
+
8
+ ### Reverts
9
+
10
+ * Revert "linting" ([cc27848](https://github.com/sonarwatch/portfolio/commit/cc27848b5a5e965d54457cd9dce7359a62c5e48d))
11
+
12
+
13
+
14
+ ## [0.11.211](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.210...plugins-0.11.211) (2024-05-23)
15
+
16
+
17
+
5
18
  ## [0.11.210](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.209...plugins-0.11.210) (2024-05-23)
6
19
 
7
20
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.11.210",
3
+ "version": "0.11.212",
4
4
  "type": "commonjs",
5
5
  "generators": "./generators.json",
6
6
  "dependencies": {
@@ -42,7 +42,7 @@
42
42
  "web3-v1": "npm:web3@^1.5.0"
43
43
  },
44
44
  "peerDependencies": {
45
- "@sonarwatch/portfolio-core": "0.11.210"
45
+ "@sonarwatch/portfolio-core": "0.11.212"
46
46
  },
47
47
  "main": "./src/index.js",
48
48
  "types": "./src/index.d.ts"
@@ -86,10 +86,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
86
86
  balances.push({
87
87
  type: parsedSubSubType[0].type,
88
88
  amountRaw,
89
+ stacked: true,
89
90
  });
90
91
  }
91
92
  const tokenPrices = yield cache.getTokenPricesAsMap(coinsTypes, portfolio_core_1.NetworkId.sui);
92
- const liquidities = [];
93
+ const depositedLiquidities = [];
94
+ const stackedLiquidities = [];
93
95
  for (let i = 0; i < balances.length; i++) {
94
96
  const coinBalance = balances[i];
95
97
  const tokenPrice = tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(coinBalance.type));
@@ -102,27 +104,41 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
102
104
  vault.baseTokenPerIbToken, portfolio_core_1.NetworkId.sui, tokenPrice);
103
105
  const assetsValue = (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value));
104
106
  const value = assetsValue;
105
- liquidities.push({
107
+ const liquidity = {
106
108
  value,
107
109
  assets,
108
110
  assetsValue,
109
111
  rewardAssets: [],
110
112
  rewardAssetsValue: null,
111
113
  yields: [],
114
+ };
115
+ if (coinBalance.stacked)
116
+ stackedLiquidities.push(liquidity);
117
+ else
118
+ depositedLiquidities.push(liquidity);
119
+ }
120
+ const elements = [];
121
+ if (depositedLiquidities.length > 0) {
122
+ elements.push({
123
+ type: 'liquidity',
124
+ data: { liquidities: depositedLiquidities },
125
+ label: 'Deposit',
126
+ networkId: portfolio_core_1.NetworkId.sui,
127
+ platformId: constants_1.platformId,
128
+ value: (0, portfolio_core_1.getUsdValueSum)(depositedLiquidities.map((l) => l.value)),
112
129
  });
113
130
  }
114
- if (liquidities.length === 0)
115
- return [];
116
- return [
117
- {
131
+ if (stackedLiquidities.length > 0) {
132
+ elements.push({
118
133
  type: 'liquidity',
119
- data: { liquidities },
134
+ data: { liquidities: stackedLiquidities },
120
135
  label: 'Staked',
121
136
  networkId: portfolio_core_1.NetworkId.sui,
122
137
  platformId: constants_1.platformId,
123
- value: (0, portfolio_core_1.getUsdValueSum)(liquidities.map((liq) => liq.value)),
124
- },
125
- ];
138
+ value: (0, portfolio_core_1.getUsdValueSum)(stackedLiquidities.map((l) => l.value)),
139
+ });
140
+ }
141
+ return elements;
126
142
  });
127
143
  const fetcher = {
128
144
  id: `${constants_1.platformId}-deposits`,
@@ -1 +1 @@
1
- {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mole/depositsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mole/depositsFetcher.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
18
18
  const constants_1 = require("./constants");
19
19
  const clients_1 = require("../../utils/clients");
20
20
  const helpers_1 = require("./helpers");
21
- const tokenPriceToAssetTokens_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetTokens"));
21
+ const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
22
22
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
23
23
  const client = (0, clients_1.getClientSui)();
24
24
  const elements = [];
@@ -39,7 +39,6 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
39
39
  const myPositions = positions.filter((position) => position.owner === owner);
40
40
  if (myPositions.length === 0)
41
41
  return [];
42
- const liquidities = [];
43
42
  yield Promise.all(myPositions.map((position) => __awaiter(void 0, void 0, void 0, function* () {
44
43
  const positionId = position.id;
45
44
  const positionWorker = position.worker;
@@ -86,41 +85,51 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
86
85
  });
87
86
  if (!dir.results || !dir.results[0].returnValues)
88
87
  return;
88
+ const borrowedAssets = [];
89
+ const borrowedYields = [];
90
+ const suppliedAssets = [];
91
+ const suppliedYields = [];
92
+ const rewardAssets = [];
89
93
  const health = new bignumber_js_1.default((0, helpers_1.serializeReturnValue)(dir.results[0].returnValues[0])).dividedBy(Math.pow(10, (borrowingInterest.isReverse
90
94
  ? farm.symbol1Decimals
91
95
  : farm.symbol2Decimals)));
92
96
  const debtValue = new bignumber_js_1.default((0, helpers_1.serializeReturnValue)(dir.results[0].returnValues[1])).dividedBy(Math.pow(10, (borrowingInterest.isReverse
93
97
  ? farm.symbol1Decimals
94
98
  : farm.symbol2Decimals)));
95
- const equityValue = health.minus(debtValue);
99
+ // const equityValue = health.minus(debtValue);
96
100
  // const leverage = health.dividedBy(equityValue);
97
101
  // const debtRatio = debtValue.dividedBy(health);
98
- const assets = [];
99
- assets.push(...(0, tokenPriceToAssetTokens_1.default)(farm.symbol1Address, borrowingInterest.isReverse ? equityValue.toNumber() : 0, portfolio_core_1.NetworkId.sui, tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(farm.symbol1Address))));
100
- assets.push(...(0, tokenPriceToAssetTokens_1.default)(farm.symbol2Address, borrowingInterest.isReverse ? 0 : equityValue.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(farm.symbol2Address))));
101
- const assetsValue = (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value));
102
- const value = assetsValue;
103
- liquidities.push({
102
+ if (borrowingInterest.isReverse) {
103
+ suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(farm.symbol1Address, health.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(farm.symbol1Address))));
104
+ borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(farm.symbol1Address, debtValue.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(farm.symbol1Address))));
105
+ }
106
+ else {
107
+ suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(farm.symbol2Address, health.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(farm.symbol2Address))));
108
+ borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(farm.symbol2Address, debtValue.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(farm.symbol2Address))));
109
+ }
110
+ const { borrowedValue, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
111
+ elements.push({
112
+ type: portfolio_core_1.PortfolioElementType.borrowlend,
113
+ networkId: portfolio_core_1.NetworkId.sui,
114
+ platformId: constants_1.platformId,
115
+ label: 'Farming',
116
+ name: `${farm.sourceName} #${positionId}`,
104
117
  value,
105
- assets,
106
- assetsValue,
107
- rewardAssets: [],
108
- rewardAssetsValue: null,
109
- yields: [],
118
+ data: {
119
+ borrowedAssets,
120
+ borrowedValue,
121
+ borrowedYields,
122
+ suppliedAssets,
123
+ suppliedValue,
124
+ suppliedYields,
125
+ collateralRatio: null,
126
+ healthRatio: debtValue.dividedBy(health).toNumber(),
127
+ rewardAssets,
128
+ rewardValue,
129
+ value,
130
+ },
110
131
  });
111
132
  })));
112
- if (liquidities.length === 0)
113
- return [];
114
- elements.push({
115
- networkId: portfolio_core_1.NetworkId.sui,
116
- platformId: constants_1.platformId,
117
- type: portfolio_core_1.PortfolioElementType.liquidity,
118
- label: 'Leverage',
119
- value: (0, portfolio_core_1.getUsdValueSum)(liquidities.map((l) => l.value)),
120
- data: {
121
- liquidities,
122
- },
123
- });
124
133
  return elements;
125
134
  });
126
135
  const fetcher = {
@@ -1 +1 @@
1
- {"version":3,"file":"farmsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mole/farmsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"farmsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mole/farmsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8DAA+D;AAC/D,+DASoC;AACpC,gEAAqC;AAGrC,2CAA8E;AAC9E,iDAAmD;AAEnD,uCAAiD;AACjD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1C,KAAK,CAAC,OAAO,CAAW,mBAAO,EAAE;YAC/B,MAAM,EAAE,wBAAY;YACpB,SAAS,EAAE,0BAAS,CAAC,GAAG;SACzB,CAAC;QACF,KAAK,CAAC,OAAO,CAAoB,wBAAY,EAAE;YAC7C,MAAM,EAAE,wBAAY;YACpB,SAAS,EAAE,0BAAS,CAAC,GAAG;SACzB,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS;QACpE,OAAO,EAAE,CAAC;IAEZ,MAAM,UAAU,GAAa,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACjD,IAAA,uCAAsB,EAAC,CAAC,CAAC,SAAS,CAAC,CACpC,CAAC;IACF,MAAM,WAAW,GAA4B,MAAM,KAAK,CAAC,mBAAmB,CAC1E,UAAU,EACV,0BAAS,CAAC,GAAG,CACd,CAAC;IAEF,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;IAE7E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAExC,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;QACjC,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;QAEvC,IAAI,IAAsB,CAAC;QAC3B,IAAI,iBAAgD,CAAC;QAErD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACjC,IAAI,CAAC,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;oBACjC,IAAI,GAAG,CAAC,CAAC;oBACT,iBAAiB,GAAG,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,iBAAiB,CAAC,WAAW,CAAC;QACtD,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACnC,MAAM,IAAI,GAAG,iBAAiB,CAAC,SAAS;YACtC,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,eAAe,CAAC;QAEpB,MAAM,EAAE,GAAG,IAAI,+BAAgB,EAAE,CAAC;QAElC,EAAE,CAAC,QAAQ,CAAC;YACV,MAAM,EAAE,GAAG,eAAe,KAAK,MAAM,KAAK,IAAI,EAAE;YAChD,SAAS,EAAE;gBACT,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC;gBACvC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;gBACpC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBACjC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;aACpB;YACD,aAAa,EAAE;gBACb,iBAAiB,CAAC,SAAS;oBACzB,CAAC,CAAC,IAAI,CAAC,cAAc;oBACrB,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe;gBACxC,iBAAiB,CAAC,SAAS;oBACzB,CAAC,CAAC,IAAI,CAAC,cAAc;oBACrB,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB;gBAC3C,IAAI,CAAC,SAAS;aACf;SACF,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC;YAClD,MAAM,EACJ,oEAAoE;YACtE,gBAAgB,EAAE,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY;YAAE,OAAO;QAEzD,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAE1C,MAAM,MAAM,GAAG,IAAI,sBAAS,CAC1B,IAAA,8BAAoB,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CACrD,CAAC,SAAS,CACT,SAAA,EAAE,EACA,CAAC,iBAAiB,CAAC,SAAS;YAC1B,CAAC,CAAC,IAAI,CAAC,eAAe;YACtB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA,CAC5B,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,sBAAS,CAC7B,IAAA,8BAAoB,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CACrD,CAAC,SAAS,CACT,SAAA,EAAE,EACA,CAAC,iBAAiB,CAAC,SAAS;YAC1B,CAAC,CAAC,IAAI,CAAC,eAAe;YACtB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA,CAC5B,CAAC;QACF,+CAA+C;QAC/C,kDAAkD;QAClD,iDAAiD;QAEjD,IAAI,iBAAiB,CAAC,SAAS,EAAE,CAAC;YAChC,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,CAAC,cAAc,EACnB,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,GAAG,EACb,WAAW,CAAC,GAAG,CAAC,IAAA,uCAAsB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAC7D,CACF,CAAC;YACF,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,CAAC,cAAc,EACnB,SAAS,CAAC,QAAQ,EAAE,EACpB,0BAAS,CAAC,GAAG,EACb,WAAW,CAAC,GAAG,CAAC,IAAA,uCAAsB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAC7D,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,CAAC,cAAc,EACnB,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,GAAG,EACb,WAAW,CAAC,GAAG,CAAC,IAAA,uCAAsB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAC7D,CACF,CAAC;YACF,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,IAAI,CAAC,cAAc,EACnB,SAAS,CAAC,QAAQ,EAAE,EACpB,0BAAS,CAAC,GAAG,EACb,WAAW,CAAC,GAAG,CAAC,IAAA,uCAAsB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAC7D,CACF,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,GACxD,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAExE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE;YACzC,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe,EAAE,IAAI;gBACrB,WAAW,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;gBACnD,YAAY;gBACZ,WAAW;gBACX,KAAK;aACN;SACF,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CACH,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
@@ -20,6 +20,7 @@ export type MoleData = {
20
20
  };
21
21
  };
22
22
  export type Farm = {
23
+ sourceName: string;
23
24
  symbol1Address: string;
24
25
  symbol1Decimals: number;
25
26
  symbol2Address: string;
@@ -18,7 +18,6 @@ const constants_1 = require("./constants");
18
18
  const clients_1 = require("../../utils/clients");
19
19
  const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
20
20
  const getDynamicFieldObject_1 = require("../../utils/sui/getDynamicFieldObject");
21
- const getAvailableRewards_1 = require("./getAvailableRewards");
22
21
  const amountFactor = new bignumber_js_1.default(Math.pow(10, 36));
23
22
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
24
23
  var _a, _b, _c, _d;
@@ -35,10 +34,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
35
34
  });
36
35
  if (!reservesData)
37
36
  return [];
38
- const [tokenPrices, rewards] = yield Promise.all([
39
- cache.getTokenPricesAsMap(reservesData.map((r) => r.value.fields.coin_type), portfolio_core_1.NetworkId.sui),
40
- (0, getAvailableRewards_1.getAvailableRewards)(client, owner),
41
- ]);
37
+ const tokenPrices = yield cache.getTokenPricesAsMap(reservesData.map((r) => r.value.fields.coin_type), portfolio_core_1.NetworkId.sui);
42
38
  for (const rData of reservesData) {
43
39
  const borrowBalancePromise = (0, getDynamicFieldObject_1.getDynamicFieldObject)(client, {
44
40
  parentId: rData.value.fields.borrow_balance.fields.user_state.fields.id.id,
@@ -96,19 +92,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
96
92
  }
97
93
  }
98
94
  }
99
- if (rewards.size > 0) {
100
- rewards.forEach((amount, coinType) => {
101
- const tokenPrice = tokenPrices.get((0, portfolio_core_1.formatTokenAddress)(coinType, portfolio_core_1.NetworkId.sui));
102
- if (tokenPrice) {
103
- rewardAssets.push((0, tokenPriceToAssetToken_1.default)(coinType, new bignumber_js_1.default(amount)
104
- .dividedBy(Math.pow(10, tokenPrice.decimals))
105
- .toNumber(), portfolio_core_1.NetworkId.sui, tokenPrice));
106
- }
107
- });
108
- }
109
- if (suppliedAssets.length === 0 &&
110
- borrowedAssets.length === 0 &&
111
- rewardAssets.length === 0)
95
+ if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
112
96
  return [];
113
97
  const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs);
114
98
  const element = {
@@ -1 +1 @@
1
- {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DASoC;AACpC,gEAAqC;AAGrC,2CAKqB;AACrB,iDAAmD;AACnD,qGAA6E;AAE7E,iFAA8E;AAE9E,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC,CAAC;AAE7C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,OAAO,CAAgB,uBAAW,EAAE;QACnE,MAAM,EAAE,0BAAc;QACtB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EACjD,0BAAS,CAAC,GAAG,CACd,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,MAAM,oBAAoB,GAAG,IAAA,6CAAqB,EAAc,MAAM,EAAE;YACtE,QAAQ,EACN,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAClE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE;SACxC,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,IAAA,6CAAqB,EAAc,MAAM,EAAE;YACtE,QAAQ,EACN,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAClE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE;SACxC,CAAC,CAAC;QACH,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvD,oBAAoB;YACpB,oBAAoB;SACrB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAChC,IAAA,mCAAkB,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,0BAAS,CAAC,GAAG,CAAC,CAChE,CAAC;QAEF,IAAI,CAAC,aAAa,CAAC,KAAK,KAAI,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,CAAA,EAAE,CAAC;YACxD,MAAM,UAAU,GAAG,MAAA,aAAa,CAAC,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAC;YACtD,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,MAAM,WAAW,GAAG,IAAA,gCAAsB,EACxC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAC5B,IAAI,sBAAS,CAAC,UAAU,CAAC,KAAK,CAAC;qBAC5B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC;qBAC9C,SAAS,CAAC,YAAY,CAAC;qBACvB,QAAQ,EAAE,EACb,0BAAS,CAAC,GAAG,EACb,UAAU,CACX,CAAC;gBACF,IAAI,WAAW,CAAC,KAAK,KAAK,IAAI,IAAI,WAAW,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;oBAC5D,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACjC,MAAM,GAAG,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC;yBAC9D,SAAS,CAAC,SAAA,EAAE,EAAI,sBAAU,CAAA,CAAC;yBAC3B,QAAQ,EAAE,CAAC;oBACd,cAAc,CAAC,IAAI,CAAC;wBAClB;4BACE,GAAG,EAAE,CAAC,IAAA,yBAAQ,EAAC,GAAG,CAAC;4BACnB,GAAG,EAAE,CAAC,GAAG;yBACV;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,KAAK,KAAI,MAAA,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAA,EAAE,CAAC;YAChE,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YACrD,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAC5B,IAAI,sBAAS,CAAC,UAAU,CAAC,KAAK,CAAC;qBAC5B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC;qBAC9C,SAAS,CAAC,YAAY,CAAC;qBACvB,QAAQ,EAAE,EACb,0BAAS,CAAC,GAAG,EACb,UAAU,CACX,CACF,CAAC;gBACF,MAAM,GAAG,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC;qBAC9D,SAAS,CAAC,SAAA,EAAE,EAAI,sBAAU,CAAA,CAAC;qBAC3B,QAAQ,EAAE,CAAC;gBACd,cAAc,CAAC,IAAI,CAAC;oBAClB;wBACE,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;wBAClB,GAAG;qBACJ;iBACF,CAAC,CAAC;gBACH,YAAY,CAAC,IAAI,CACf,IAAI,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;qBACnE,GAAG,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;qBACb,QAAQ,EAAE,CACd,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE1E,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,GACrE,IAAA,wCAAuB,EACrB,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,CACb,CAAC;IACJ,MAAM,OAAO,GAAqB;QAChC,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;QACxB,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,eAAe,EAAE,IAAI;YACrB,WAAW;YACX,YAAY;YACZ,WAAW;YACX,KAAK;SACN;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
@@ -14,24 +14,3 @@ export declare const poolsInfos: {
14
14
  borrowBalanceParentId: string;
15
15
  supplyBalanceParentId: string;
16
16
  }[];
17
- export declare const rewardsFunds: {
18
- f975bc2d4cca10e3ace8887e20afd77b46c383b4465eac694c4688344955dea4: {
19
- coinType: string;
20
- oracleId: number;
21
- };
22
- e2b5ada45273676e0da8ae10f8fe079a7cec3d0f59187d3d20b1549c275b07ea: {
23
- coinType: string;
24
- oracleId: number;
25
- };
26
- a20e18085ce04be8aa722fbe85423f1ad6b1ae3b1be81ffac00a30f1d6d6ab51: {
27
- coinType: string;
28
- oracleId: number;
29
- };
30
- '9dae0cf104a193217904f88a48ce2cf0221e8cd9073878edd05101d6b771fa09': {
31
- coinType: string;
32
- oracleId: number;
33
- };
34
- };
35
- export declare const incentiveFunction = "0x64372b54147adb0ac8a603adab92c81e3d732c8cafafa368d8f3ff9dcb6a53af::incentive_getter::get_incentive_pools_group_by_phase";
36
- export declare const incentiveObjectId = "0xf87a8acb8b81d14307894d12595541a73f19933f88e1326d5be349c7a6f7559c";
37
- export declare const incentiveStorageObjectId = "0xbb4e2f4b6205c2e2a2db47aeb4f830796ec7c005f88537ee775986639bc442fe";
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.incentiveStorageObjectId = exports.incentiveObjectId = exports.incentiveFunction = exports.rewardsFunds = exports.poolsInfos = exports.rateFactor = exports.reserveParentId = exports.reservesKey = exports.reservesPrefix = exports.platform = exports.platformId = void 0;
3
+ exports.poolsInfos = exports.rateFactor = exports.reserveParentId = exports.reservesKey = exports.reservesPrefix = exports.platform = exports.platformId = void 0;
4
4
  exports.platformId = 'navi';
5
5
  exports.platform = {
6
6
  id: exports.platformId,
@@ -61,25 +61,4 @@ exports.poolsInfos = [
61
61
  supplyBalanceParentId: '0x6adc72faf2a9a15a583c9fb04f457c6a5f0b456bc9b4832413a131dfd4faddae',
62
62
  },
63
63
  ];
64
- exports.rewardsFunds = {
65
- f975bc2d4cca10e3ace8887e20afd77b46c383b4465eac694c4688344955dea4: {
66
- coinType: '0x2::sui::SUI',
67
- oracleId: 0,
68
- },
69
- e2b5ada45273676e0da8ae10f8fe079a7cec3d0f59187d3d20b1549c275b07ea: {
70
- coinType: '0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT',
71
- oracleId: 5,
72
- },
73
- a20e18085ce04be8aa722fbe85423f1ad6b1ae3b1be81ffac00a30f1d6d6ab51: {
74
- coinType: '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI',
75
- oracleId: 6,
76
- },
77
- '9dae0cf104a193217904f88a48ce2cf0221e8cd9073878edd05101d6b771fa09': {
78
- coinType: '0xa99b8952d4f7d947ea77fe0ecdcc9e5fc0bcab2841d6e2a5aa00c3044e5544b5::navx::NAVX',
79
- oracleId: 7,
80
- },
81
- };
82
- exports.incentiveFunction = '0x64372b54147adb0ac8a603adab92c81e3d732c8cafafa368d8f3ff9dcb6a53af::incentive_getter::get_incentive_pools_group_by_phase';
83
- exports.incentiveObjectId = '0xf87a8acb8b81d14307894d12595541a73f19933f88e1326d5be349c7a6f7559c';
84
- exports.incentiveStorageObjectId = '0xbb4e2f4b6205c2e2a2db47aeb4f830796ec7c005f88537ee775986639bc442fe';
85
64
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,qCAAqC,kBAAU,MAAM;IAC5D,WAAW,EAAE,sBAAsB;IACnC,OAAO,EAAE,8BAA8B;IACvC,OAAO,EAAE,mCAAmC;CAC7C,CAAC;AAEW,QAAA,cAAc,GAAG,kBAAU,CAAC;AAC5B,QAAA,WAAW,GAAG,UAAU,CAAC;AAEzB,QAAA,eAAe,GAC1B,oEAAoE,CAAC;AAE1D,QAAA,UAAU,GAAG,EAAE,CAAC;AAEhB,QAAA,UAAU,GAAG;IACxB;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,8EAA8E;QACpF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,oEAAoE;QAC1E,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,oEAAoE;QAC1E,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,EAAE;QACR,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,IAAI,EAAE,oEAAoE;QAC1E,WAAW,EACT,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,kFAAkF;QACxF,IAAI,EAAE,oEAAoE;QAC1E,WAAW,EACT,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;CACF,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,gEAAgE,EAAE;QAChE,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,CAAC;KACZ;IACD,gEAAgE,EAAE;QAChE,QAAQ,EACN,gFAAgF;QAClF,QAAQ,EAAE,CAAC;KACZ;IACD,gEAAgE,EAAE;QAChE,QAAQ,EACN,kFAAkF;QACpF,QAAQ,EAAE,CAAC;KACZ;IACD,kEAAkE,EAAE;QAClE,QAAQ,EACN,gFAAgF;QAClF,QAAQ,EAAE,CAAC;KACZ;CACF,CAAC;AAEW,QAAA,iBAAiB,GAC5B,0HAA0H,CAAC;AAChH,QAAA,iBAAiB,GAC5B,oEAAoE,CAAC;AAC1D,QAAA,wBAAwB,GACnC,oEAAoE,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,qCAAqC,kBAAU,MAAM;IAC5D,WAAW,EAAE,sBAAsB;IACnC,OAAO,EAAE,8BAA8B;IACvC,OAAO,EAAE,mCAAmC;CAC7C,CAAC;AAEW,QAAA,cAAc,GAAG,kBAAU,CAAC;AAC5B,QAAA,WAAW,GAAG,UAAU,CAAC;AAEzB,QAAA,eAAe,GAC1B,oEAAoE,CAAC;AAE1D,QAAA,UAAU,GAAG,EAAE,CAAC;AAEhB,QAAA,UAAU,GAAG;IACxB;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,8EAA8E;QACpF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,oEAAoE;QAC1E,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,oEAAoE;QAC1E,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,WAAW,EACT,oEAAoE;QACtE,IAAI,EAAE,EAAE;QACR,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gFAAgF;QACtF,IAAI,EAAE,oEAAoE;QAC1E,WAAW,EACT,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;IACD;QACE,EAAE,EAAE,CAAC;QACL,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,kFAAkF;QACxF,IAAI,EAAE,oEAAoE;QAC1E,WAAW,EACT,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;QACtE,qBAAqB,EACnB,oEAAoE;KACvE;CACF,CAAC"}
@@ -68,7 +68,3 @@ export type BalanceData = {
68
68
  name: string;
69
69
  value: string;
70
70
  };
71
- export type Pool = {
72
- available: string;
73
- funds: string;
74
- };
@@ -1,2 +0,0 @@
1
- import { SuiClient } from '../../utils/clients/types';
2
- export declare function getAvailableRewards(client: SuiClient, owner: string): Promise<Map<string, number>>;
@@ -1,109 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
- Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.getAvailableRewards = void 0;
16
- const transactions_1 = require("@mysten/sui.js/transactions");
17
- const bcs_1 = require("@mysten/bcs");
18
- const bignumber_js_1 = __importDefault(require("bignumber.js"));
19
- const portfolio_core_1 = require("@sonarwatch/portfolio-core");
20
- const constants_1 = require("./constants");
21
- const bcs = new bcs_1.BCS((0, bcs_1.getSuiMoveConfig)());
22
- bcs.registerStructType('IncentivePoolInfo', {
23
- pool_id: 'address',
24
- funds: 'address',
25
- phase: 'u64',
26
- start_at: 'u64',
27
- end_at: 'u64',
28
- closed_at: 'u64',
29
- total_supply: 'u64',
30
- asset_id: 'u8',
31
- option: 'u8',
32
- factor: 'u256',
33
- distributed: 'u64',
34
- available: 'u256',
35
- total: 'u256',
36
- });
37
- bcs.registerStructType('IncentivePoolInfoByPhase', {
38
- phase: 'u64',
39
- pools: 'vector<IncentivePoolInfo>',
40
- });
41
- function getSupplyRewardsTransactionBlock(owner) {
42
- const tx = new transactions_1.TransactionBlock();
43
- tx.moveCall({
44
- target: constants_1.incentiveFunction,
45
- arguments: [
46
- tx.object(portfolio_core_1.suiClockAddress),
47
- tx.object(constants_1.incentiveObjectId),
48
- tx.object(constants_1.incentiveStorageObjectId),
49
- tx.pure(0),
50
- tx.pure(1),
51
- tx.pure(owner),
52
- ],
53
- });
54
- return tx;
55
- }
56
- function getBorrowRewardsTransactionBlock(owner) {
57
- const tx = new transactions_1.TransactionBlock();
58
- tx.moveCall({
59
- target: constants_1.incentiveFunction,
60
- arguments: [
61
- tx.object(portfolio_core_1.suiClockAddress),
62
- tx.object(constants_1.incentiveObjectId),
63
- tx.object(constants_1.incentiveStorageObjectId),
64
- tx.pure(1),
65
- tx.pure(3),
66
- tx.pure(owner),
67
- ],
68
- });
69
- return tx;
70
- }
71
- function getRewardPoolsData(client, tx, owner) {
72
- return __awaiter(this, void 0, void 0, function* () {
73
- const rewardsPoolsInfos = yield client.devInspectTransactionBlock({
74
- transactionBlock: tx,
75
- sender: owner,
76
- });
77
- if (rewardsPoolsInfos.results && rewardsPoolsInfos.results[0].returnValues) {
78
- const o = rewardsPoolsInfos.results[0].returnValues;
79
- return o
80
- .map((e) => bcs.de('vector<IncentivePoolInfoByPhase>', Uint8Array.from(e[0])))
81
- .flat()
82
- .sort((e, n) => Number(n.phase) - Number(e.phase));
83
- }
84
- return [];
85
- });
86
- }
87
- function getAvailableRewards(client, owner) {
88
- return __awaiter(this, void 0, void 0, function* () {
89
- const [supplyRewardPoolsData, borrowRewardPoolsData] = yield Promise.all([
90
- getRewardPoolsData(client, getSupplyRewardsTransactionBlock(owner), owner),
91
- getRewardPoolsData(client, getBorrowRewardsTransactionBlock(owner), owner),
92
- ]);
93
- const rewards = new Map();
94
- const browseRewardPoolData = (e) => {
95
- e.pools.forEach((pool) => {
96
- const funds = pool.funds;
97
- const { coinType } = constants_1.rewardsFunds[funds];
98
- const aggAmount = rewards.get(coinType) || 0;
99
- rewards.set(coinType, aggAmount +
100
- new bignumber_js_1.default(pool.available).shiftedBy(-1 * constants_1.rateFactor).toNumber());
101
- });
102
- };
103
- supplyRewardPoolsData.forEach(browseRewardPoolData);
104
- borrowRewardPoolsData.forEach(browseRewardPoolData);
105
- return rewards;
106
- });
107
- }
108
- exports.getAvailableRewards = getAvailableRewards;
109
- //# sourceMappingURL=getAvailableRewards.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"getAvailableRewards.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/getAvailableRewards.ts"],"names":[],"mappings":"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"}