@sonarwatch/portfolio-plugins 0.15.33 → 0.15.34

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.
package/CHANGELOG.md CHANGED
@@ -2,10 +2,14 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
- ## [0.15.33](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.32...plugins-0.15.33) (2025-06-18)
5
+ ## [0.15.34](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.33...plugins-0.15.34) (2025-06-18)
6
6
 
7
7
 
8
8
 
9
+ ## [0.15.33](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.32...plugins-0.15.33) (2025-06-18)
10
+
11
+
12
+
9
13
  ## [0.15.32](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.31...plugins-0.15.32) (2025-06-18)
10
14
 
11
15
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.15.33",
3
+ "version": "0.15.34",
4
4
  "type": "commonjs",
5
5
  "types": "./src/index.d.ts",
6
6
  "peerDependencies": {
@@ -19,6 +19,7 @@ const constants_1 = require("./constants");
19
19
  const solana_1 = require("../../utils/solana");
20
20
  const vaults_1 = require("./structs/vaults");
21
21
  const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
22
+ const common_1 = require("./helpers/common");
22
23
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
23
24
  const client = (0, clients_1.getClientSolana)();
24
25
  const accounts = yield ParsedGpa_1.ParsedGpa.build(client, vaults_1.vaultStateStruct, constants_1.vaultProgramId)
@@ -57,7 +58,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
57
58
  const shares = account.sharesIssued.shiftedBy(-account.sharesMintDecimals);
58
59
  const totalAvailable = account.tokenAvailable.shiftedBy(-account.tokenMintDecimals);
59
60
  const totalInvested = investedInReserve.shiftedBy(-account.tokenMintDecimals);
60
- const pendingFees = account.pendingFeesSf.shiftedBy(-account.tokenMintDecimals);
61
+ const pendingFees = (0, common_1.sfToValue)(account.pendingFeesSf).shiftedBy(-account.tokenMintDecimals);
61
62
  const totalAUMIncludingFees = totalAvailable.plus(totalInvested);
62
63
  const netAUM = totalAUMIncludingFees.minus(pendingFees);
63
64
  const perShare = netAUM.div(shares);
@@ -1 +1 @@
1
- {"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/vaultsJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/vaultsJob.ts"],"names":[],"mappings":"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"}
@@ -8,14 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  step((generator = generator.apply(thisArg, _arguments || [])).next());
9
9
  });
10
10
  };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
11
14
  Object.defineProperty(exports, "__esModule", { value: true });
12
15
  const portfolio_core_1 = require("@sonarwatch/portfolio-core");
13
16
  const web3_js_1 = require("@solana/web3.js");
17
+ const bignumber_js_1 = __importDefault(require("bignumber.js"));
14
18
  const constants_1 = require("./constants");
15
19
  const clients_1 = require("../../utils/clients");
16
20
  const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
17
21
  const structs_1 = require("./structs");
18
22
  const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
23
+ const solana_1 = require("../../utils/solana");
19
24
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
20
25
  const connection = (0, clients_1.getClientSolana)();
21
26
  const accounts = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.positionStruct, constants_1.pid)
@@ -24,7 +29,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
24
29
  .run();
25
30
  if (!accounts.length)
26
31
  return [];
27
- const tokenPricesMap = yield cache.getTokenPricesAsMap(accounts.map((acc) => acc.collateral.toString()), portfolio_core_1.NetworkId.solana);
32
+ const tokenPricesMap = yield cache.getTokenPricesAsMap([
33
+ ...accounts.flatMap((acc) => [
34
+ acc.collateral.toString(),
35
+ acc.currency.toString(),
36
+ ]),
37
+ portfolio_core_1.solanaNativeWrappedAddress,
38
+ ], portfolio_core_1.NetworkId.solana);
39
+ const solTokenPrice = tokenPricesMap.get(portfolio_core_1.solanaNativeWrappedAddress);
40
+ if (!solTokenPrice)
41
+ return [];
28
42
  const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
29
43
  accounts.forEach((position) => {
30
44
  const element = elementRegistry.addElementLeverage({
@@ -35,25 +49,49 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
35
49
  const principalPrice = tokenPricesMap.get(position.currency.toString());
36
50
  if (!collatPrice || !principalPrice)
37
51
  return;
38
- const collateralValue = position.collateralAmount.times(collatPrice.price);
39
- const principalValue = position.principal.times(principalPrice.price);
40
- const leverage = collateralValue
41
- .plus(principalValue)
42
- .dividedBy(collateralValue)
43
- .toNumber();
52
+ const collateralValue = position.collateralAmount
53
+ .times(collatPrice.price)
54
+ .dividedBy(Math.pow(10, collatPrice.decimals));
55
+ // const principalValue = position.principal.times(principalPrice.price);
56
+ const isLong = position.currency.toString() === solana_1.usdcSolanaMint ||
57
+ (position.currency.toString() === portfolio_core_1.solanaNativeWrappedAddress &&
58
+ position.collateral.toString() !== solana_1.usdcSolanaMint);
59
+ const isEntryPriceSolPrice = (isLong && position.currency.toString() === portfolio_core_1.solanaNativeWrappedAddress) ||
60
+ (!isLong &&
61
+ position.collateral.toString() === portfolio_core_1.solanaNativeWrappedAddress);
62
+ const entryPriceRaw = isLong
63
+ ? position.principal
64
+ .plus(position.downPayment)
65
+ .dividedBy(position.collateralAmount)
66
+ : position.collateralAmount
67
+ .minus(position.downPayment)
68
+ .dividedBy(position.principal);
69
+ const entryPrice = isEntryPriceSolPrice
70
+ ? entryPriceRaw.times(solTokenPrice.price)
71
+ : entryPriceRaw;
72
+ const leverage = isLong
73
+ ? position.principal.dividedBy(position.downPayment)
74
+ : position.collateralAmount.dividedBy(position.downPayment).minus(1);
75
+ const interestOwed = new bignumber_js_1.default(Date.now())
76
+ .dividedBy(1000)
77
+ .minus(position.lastFundingTimestamp)
78
+ .times(0.3)
79
+ .dividedBy(365 * 24 * 60 * 60);
80
+ const pnlValue = principalPrice.price - entryPrice.toNumber() - interestOwed.toNumber();
81
+ const side = isLong ? portfolio_core_1.LeverageSide.long : portfolio_core_1.LeverageSide.short;
44
82
  element.addIsoPosition({
45
83
  collateralValue: collateralValue.toNumber(),
46
84
  address: position.collateral.toString(),
47
- entryPrice: 0, // missing
48
- leverage,
85
+ entryPrice: entryPrice.toNumber(),
86
+ leverage: leverage.toNumber(),
49
87
  markPrice: principalPrice.price,
50
- liquidationPrice: 0, // missing
51
- side: portfolio_core_1.LeverageSide.long, // missing
88
+ liquidationPrice: 0,
89
+ side,
52
90
  size: position.collateralAmount
53
91
  .dividedBy(Math.pow(10, collatPrice.decimals))
54
92
  .toNumber(),
55
93
  sizeValue: collateralValue.toNumber(),
56
- pnlValue: 0, // missing
94
+ pnlValue,
57
95
  });
58
96
  });
59
97
  return elementRegistry.getElements(cache);
@@ -1 +1 @@
1
- {"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wasabi/positionsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wasabi/positionsFetcher.ts"],"names":[],"mappings":"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"}