@sonarwatch/portfolio-plugins 0.15.40 → 0.15.41

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 (114) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/package.json +1 -1
  3. package/src/plugins/bonfida/airdropFetcher.d.ts +3 -3
  4. package/src/plugins/bonfida/airdropFetcher.js +63 -29
  5. package/src/plugins/bonfida/airdropFetcher.js.map +1 -1
  6. package/src/plugins/bonfida/constants.d.ts +1 -0
  7. package/src/plugins/bonfida/constants.js +11 -2
  8. package/src/plugins/bonfida/constants.js.map +1 -1
  9. package/src/plugins/bonfida/index.js +3 -3
  10. package/src/plugins/bonfida/index.js.map +1 -1
  11. package/src/plugins/debridge/airdropFetcher.js +6 -0
  12. package/src/plugins/debridge/airdropFetcher.js.map +1 -1
  13. package/src/plugins/drift-market-maker-vault/depositsFetcher.js +18 -5
  14. package/src/plugins/drift-market-maker-vault/depositsFetcher.js.map +1 -1
  15. package/src/plugins/drift-market-maker-vault/types.d.ts +1 -0
  16. package/src/plugins/drift-market-maker-vault/vaultsJob.js +9 -1
  17. package/src/plugins/drift-market-maker-vault/vaultsJob.js.map +1 -1
  18. package/src/plugins/exponent/ptPricesJob.js +18 -3
  19. package/src/plugins/exponent/ptPricesJob.js.map +1 -1
  20. package/src/plugins/flash/custodiesJob.js +1 -1
  21. package/src/plugins/flash/custodiesJob.js.map +1 -1
  22. package/src/plugins/flash/index.js +5 -4
  23. package/src/plugins/flash/index.js.map +1 -1
  24. package/src/plugins/flash/perpetualFetcher.js +35 -71
  25. package/src/plugins/flash/perpetualFetcher.js.map +1 -1
  26. package/src/plugins/flash/{poolJob.js → poolsJob.js} +1 -1
  27. package/src/plugins/flash/poolsJob.js.map +1 -0
  28. package/src/plugins/flash/poolsYieldJob.d.ts +3 -0
  29. package/src/plugins/flash/poolsYieldJob.js +54 -0
  30. package/src/plugins/flash/poolsYieldJob.js.map +1 -0
  31. package/src/plugins/huma/index.js +2 -1
  32. package/src/plugins/huma/index.js.map +1 -1
  33. package/src/plugins/huma/pstYieldJob.d.ts +3 -0
  34. package/src/plugins/huma/pstYieldJob.js +40 -0
  35. package/src/plugins/huma/pstYieldJob.js.map +1 -0
  36. package/src/plugins/jito/airdropFetcher.d.ts +2 -3
  37. package/src/plugins/jito/airdropFetcher.js +42 -47
  38. package/src/plugins/jito/airdropFetcher.js.map +1 -1
  39. package/src/plugins/jito/airdropFetcher_old.d.ts +3 -0
  40. package/src/plugins/jito/airdropFetcher_old.js +66 -0
  41. package/src/plugins/jito/airdropFetcher_old.js.map +1 -0
  42. package/src/plugins/jito/constants.d.ts +2 -0
  43. package/src/plugins/jito/constants.js +10 -1
  44. package/src/plugins/jito/constants.js.map +1 -1
  45. package/src/plugins/jito/index.d.ts +1 -0
  46. package/src/plugins/jito/index.js +7 -3
  47. package/src/plugins/jito/index.js.map +1 -1
  48. package/src/plugins/jito/structs.d.ts +1 -1
  49. package/src/plugins/jito/structs.js +1 -1
  50. package/src/plugins/jito/structs.js.map +1 -1
  51. package/src/plugins/jupiter/launchpad/lfgAirdropFetcher.js +7 -2
  52. package/src/plugins/jupiter/launchpad/lfgAirdropFetcher.js.map +1 -1
  53. package/src/plugins/magiceden/airdropFetcher.js +46 -19
  54. package/src/plugins/magiceden/airdropFetcher.js.map +1 -1
  55. package/src/plugins/magiceden/structs.d.ts +11 -0
  56. package/src/plugins/magiceden/structs.js +11 -1
  57. package/src/plugins/magiceden/structs.js.map +1 -1
  58. package/src/plugins/meteora/vaultsJob.js +1 -0
  59. package/src/plugins/meteora/vaultsJob.js.map +1 -1
  60. package/src/plugins/ratex/ptPricesJob.js +11 -1
  61. package/src/plugins/ratex/ptPricesJob.js.map +1 -1
  62. package/src/plugins/solayer/index.js +2 -1
  63. package/src/plugins/solayer/index.js.map +1 -1
  64. package/src/plugins/solayer/poolsJob.js +4 -2
  65. package/src/plugins/solayer/poolsJob.js.map +1 -1
  66. package/src/plugins/solayer/poolsYieldJob.d.ts +3 -0
  67. package/src/plugins/solayer/poolsYieldJob.js +41 -0
  68. package/src/plugins/solayer/poolsYieldJob.js.map +1 -0
  69. package/src/plugins/streamflow/airdropFetcher.js +1 -7
  70. package/src/plugins/streamflow/airdropFetcher.js.map +1 -1
  71. package/src/plugins/streamflow/helpers.d.ts +1 -0
  72. package/src/plugins/streamflow/helpers.js +63 -1
  73. package/src/plugins/streamflow/helpers.js.map +1 -1
  74. package/src/plugins/tensor/season4AirdropFetcher.js +15 -7
  75. package/src/plugins/tensor/season4AirdropFetcher.js.map +1 -1
  76. package/src/plugins/tokens/fetchers/solana.js +3 -10
  77. package/src/plugins/tokens/fetchers/solana.js.map +1 -1
  78. package/src/plugins/wormhole/airdropFetcher.js +10 -2
  79. package/src/plugins/wormhole/airdropFetcher.js.map +1 -1
  80. package/src/plugins/wormhole/structs.d.ts +36 -1
  81. package/src/plugins/wormhole/structs.js +40 -1
  82. package/src/plugins/wormhole/structs.js.map +1 -1
  83. package/src/utils/elementbuilder/AssetBuilder.d.ts +2 -1
  84. package/src/utils/elementbuilder/AssetBuilder.js.map +1 -1
  85. package/src/utils/elementbuilder/AssetTokenBuilder.d.ts +3 -2
  86. package/src/utils/elementbuilder/AssetTokenBuilder.js +6 -3
  87. package/src/utils/elementbuilder/AssetTokenBuilder.js.map +1 -1
  88. package/src/utils/elementbuilder/ElementBorrowlendBuilder.d.ts +2 -1
  89. package/src/utils/elementbuilder/ElementBorrowlendBuilder.js +4 -4
  90. package/src/utils/elementbuilder/ElementBorrowlendBuilder.js.map +1 -1
  91. package/src/utils/elementbuilder/ElementBuilder.d.ts +2 -1
  92. package/src/utils/elementbuilder/ElementBuilder.js.map +1 -1
  93. package/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.d.ts +2 -1
  94. package/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.js +2 -2
  95. package/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.js.map +1 -1
  96. package/src/utils/elementbuilder/ElementLeverageBuilder.d.ts +2 -1
  97. package/src/utils/elementbuilder/ElementLeverageBuilder.js +2 -2
  98. package/src/utils/elementbuilder/ElementLeverageBuilder.js.map +1 -1
  99. package/src/utils/elementbuilder/ElementLiquidityBuilder.d.ts +2 -1
  100. package/src/utils/elementbuilder/ElementLiquidityBuilder.js +2 -2
  101. package/src/utils/elementbuilder/ElementLiquidityBuilder.js.map +1 -1
  102. package/src/utils/elementbuilder/ElementMultipleBuilder.d.ts +2 -1
  103. package/src/utils/elementbuilder/ElementMultipleBuilder.js +2 -2
  104. package/src/utils/elementbuilder/ElementMultipleBuilder.js.map +1 -1
  105. package/src/utils/elementbuilder/ElementRegistry.js +2 -1
  106. package/src/utils/elementbuilder/ElementRegistry.js.map +1 -1
  107. package/src/utils/elementbuilder/ElementTradeBuilder.d.ts +2 -1
  108. package/src/utils/elementbuilder/ElementTradeBuilder.js +3 -3
  109. package/src/utils/elementbuilder/ElementTradeBuilder.js.map +1 -1
  110. package/src/utils/elementbuilder/LiquidityBuilder.d.ts +2 -1
  111. package/src/utils/elementbuilder/LiquidityBuilder.js +3 -3
  112. package/src/utils/elementbuilder/LiquidityBuilder.js.map +1 -1
  113. package/src/plugins/flash/poolJob.js.map +0 -1
  114. /package/src/plugins/flash/{poolJob.d.ts → poolsJob.d.ts} +0 -0
package/CHANGELOG.md CHANGED
@@ -2,6 +2,22 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [0.15.41](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.40...plugins-0.15.41) (2025-06-27)
6
+
7
+
8
+ ### Features
9
+
10
+ * **airdrop:** add claims info ([4a5760a](https://github.com/sonarwatch/portfolio/commit/4a5760a99510c8ce29df6173687eaf5793028a0e))
11
+ * **airdrop:** add claims info ([54da11f](https://github.com/sonarwatch/portfolio/commit/54da11ff036c979ac27c0cbe897e2406ffc6e93c))
12
+ * **airdrop:** add claims info for Streamflow Solana airdrop ([3d0a2b5](https://github.com/sonarwatch/portfolio/commit/3d0a2b5cab483322fa7d0e28ccd12c3736639b51))
13
+ * **airdrop:** add DNR claims info ([c5bc8c7](https://github.com/sonarwatch/portfolio/commit/c5bc8c72677d9dd29e8a11c1395fc2e15c2d079e))
14
+ * **airdrop:** add FIDA claims ([284a533](https://github.com/sonarwatch/portfolio/commit/284a533f9a190370afe488dd24c1598c877cd01f))
15
+ * **airdrop:** add JITO claims info ([7e88d32](https://github.com/sonarwatch/portfolio/commit/7e88d323bc30f68117fda4005aae15dd0a8b3436))
16
+ * **airdrop:** implement distribution claim logic and add distributionClaimStruct ([3a4f244](https://github.com/sonarwatch/portfolio/commit/3a4f24423d87e9b7452bbeaca09f9af7f0a24ce9))
17
+ * **fetchers:** update fetchers import to use defaultFetchers in run-fetchers-by-network-id script ([d6a1bb3](https://github.com/sonarwatch/portfolio/commit/d6a1bb3e27d7ec2036638a4aefca21510e9a17ff))
18
+
19
+
20
+
5
21
  ## [0.15.40](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.39...plugins-0.15.40) (2025-06-24)
6
22
 
7
23
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.15.40",
3
+ "version": "0.15.41",
4
4
  "type": "commonjs",
5
5
  "types": "./src/index.d.ts",
6
6
  "peerDependencies": {
@@ -1,3 +1,3 @@
1
- import { Fetcher } from '../../Fetcher';
2
- declare const fetcher: Fetcher;
3
- export default fetcher;
1
+ import { AirdropFetcher } from '../../AirdropFetcher';
2
+ export declare const airdropFetcher: AirdropFetcher;
3
+ export declare const fetcher: import("../..").Fetcher;
@@ -12,48 +12,82 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.fetcher = exports.airdropFetcher = void 0;
15
16
  const portfolio_core_1 = require("@sonarwatch/portfolio-core");
16
17
  const axios_1 = __importDefault(require("axios"));
17
18
  const bignumber_js_1 = __importDefault(require("bignumber.js"));
19
+ const web3_js_1 = require("@solana/web3.js");
18
20
  const constants_1 = require("./constants");
19
- const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
20
- const solana_1 = require("../../utils/solana");
21
21
  const structs_1 = require("../jito/structs");
22
22
  const clients_1 = require("../../utils/clients");
23
- const filters_1 = require("./filters");
24
- const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
23
+ const AirdropFetcher_1 = require("../../AirdropFetcher");
24
+ const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
25
+ const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
26
+ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
25
27
  const apiRes = yield axios_1.default
26
28
  .get(constants_1.airdropApi + owner, { timeout: 5000 })
27
29
  .catch(() => null);
28
- if (!apiRes || apiRes.data.error)
29
- return [];
30
30
  const client = (0, clients_1.getClientSolana)();
31
- const claimStatus = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.claimStatusStruct, constants_1.airdropPid, (0, filters_1.claimFilters)(owner));
32
- const claim = claimStatus.at(0);
33
- if (claim)
34
- return [];
35
- const fidaTokenPrice = yield cache.getTokenPrice(constants_1.fidaMint, portfolio_core_1.NetworkId.solana);
36
- const amount = new bignumber_js_1.default(apiRes.data.amount_unlocked).dividedBy(Math.pow(10, constants_1.fidaDecimals));
37
- const element = {
38
- networkId: portfolio_core_1.NetworkId.solana,
39
- label: 'Airdrop',
40
- platformId: constants_1.platformId,
41
- type: portfolio_core_1.PortfolioElementType.multiple,
42
- value: fidaTokenPrice
43
- ? amount.times(fidaTokenPrice.price).toNumber()
44
- : null,
45
- data: {
46
- assets: [
47
- (0, tokenPriceToAssetToken_1.default)(constants_1.fidaMint, amount.toNumber(), portfolio_core_1.NetworkId.solana, fidaTokenPrice),
31
+ const claimStatus = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.claimStatusStruct, constants_1.airdropPid)
32
+ .addFilter('discriminator', [22, 183, 249, 157, 247, 95, 150, 96])
33
+ .addFilter('claimant', new web3_js_1.PublicKey(owner))
34
+ .run();
35
+ // neither an API response nor claims accounts
36
+ if ((!apiRes || apiRes.data.error) && !claimStatus.length) {
37
+ return (0, AirdropFetcher_1.getAirdropRaw)({
38
+ statics: constants_1.fidaAirdropStatics,
39
+ items: [
40
+ {
41
+ amount: 0,
42
+ isClaimed: false,
43
+ label: 'FIDA',
44
+ address: constants_1.fidaMint,
45
+ },
48
46
  ],
49
- },
50
- };
51
- return [element];
47
+ });
48
+ }
49
+ // if there is no claim status, it means the user is eligible but has not claimed yet
50
+ if (!claimStatus.length && apiRes) {
51
+ return (0, AirdropFetcher_1.getAirdropRaw)({
52
+ statics: constants_1.fidaAirdropStatics,
53
+ items: [
54
+ {
55
+ amount: new bignumber_js_1.default(apiRes.data.amount_unlocked)
56
+ .dividedBy(Math.pow(10, constants_1.fidaDecimals))
57
+ .toNumber(),
58
+ isClaimed: false,
59
+ label: 'FIDA',
60
+ address: constants_1.fidaMint,
61
+ },
62
+ ],
63
+ });
64
+ }
65
+ const claims = yield Promise.all([
66
+ ...claimStatus.map((cs) => (0, getClaimTransactions_1.getClaimTransactions)(owner, cs.pubkey, constants_1.fidaMint)),
67
+ ]);
68
+ const claimedAmount = claims.reduce((acc, claim) => acc.plus(claim.reduce((sum, tx) => sum.plus(tx.amount), new bignumber_js_1.default(0))), new bignumber_js_1.default(0));
69
+ return (0, AirdropFetcher_1.getAirdropRaw)({
70
+ statics: constants_1.fidaAirdropStatics,
71
+ items: [
72
+ {
73
+ amount: apiRes
74
+ ? new bignumber_js_1.default(apiRes.data.amount_unlocked)
75
+ .dividedBy(Math.pow(10, constants_1.fidaDecimals))
76
+ .toNumber()
77
+ : claimedAmount.toNumber(),
78
+ isClaimed: true,
79
+ label: 'FIDA',
80
+ address: constants_1.fidaMint,
81
+ claims: claims.flat(),
82
+ ref: claimStatus ? claimStatus[0].pubkey.toString() : undefined,
83
+ },
84
+ ],
85
+ });
52
86
  });
53
- const fetcher = {
54
- id: `${constants_1.platformId}-airdrop`,
87
+ exports.airdropFetcher = {
88
+ id: constants_1.fidaAirdropStatics.id,
55
89
  networkId: portfolio_core_1.NetworkId.solana,
56
90
  executor,
57
91
  };
58
- exports.default = fetcher;
92
+ exports.fetcher = (0, AirdropFetcher_1.airdropFetcherToFetcher)(exports.airdropFetcher, constants_1.platformId, constants_1.fidaAirdropStatics.id, constants_1.fidaAirdropStatics.claimEnd);
59
93
  //# sourceMappingURL=airdropFetcher.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,kDAA6C;AAC7C,gEAAqC;AAErC,2CAMqB;AAErB,qGAA6E;AAE7E,+CAA8D;AAC9D,6CAAoD;AACpD,iDAAsD;AACtD,uCAAyC;AAEzC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAA0C,MAAM,eAAK;SAC9D,GAAG,CAAC,sBAAU,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAE5C,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAChD,MAAM,EACN,2BAAiB,EACjB,sBAAU,EACV,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;IACF,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,KAAK;QAAE,OAAO,EAAE,CAAC;IAErB,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,CACjE,SAAA,EAAE,EAAI,wBAAY,CAAA,CACnB,CAAC;IAEF,MAAM,OAAO,GAA6B;QACxC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,KAAK,EAAE,SAAS;QAChB,UAAU,EAAV,sBAAU;QACV,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,KAAK,EAAE,cAAc;YACnB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;YAC/C,CAAC,CAAC,IAAI;QACR,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,IAAA,gCAAsB,EACpB,oBAAQ,EACR,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,MAAM,EAChB,cAAc,CACf;aACF;SACF;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/airdropFetcher.ts"],"names":[],"mappings":"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"}
@@ -10,3 +10,4 @@ export declare const airdropApi = "https://jito-distributor-api.n38t0uklh84us.ap
10
10
  export declare const fidaDecimals = 6;
11
11
  export declare const snsMint = "SNS8DJbHc34nKySHVhLGMUUE72ho6igvJaxtq9T3cX3";
12
12
  export declare const snsAirdropStatics: AirdropStatics;
13
+ export declare const fidaAirdropStatics: AirdropStatics;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.snsAirdropStatics = exports.snsMint = exports.fidaDecimals = exports.airdropApi = exports.airdropPid = exports.offerPid = exports.fidaMint = exports.platformId = void 0;
3
+ exports.fidaAirdropStatics = exports.snsAirdropStatics = exports.snsMint = exports.fidaDecimals = exports.airdropApi = exports.airdropPid = exports.offerPid = exports.fidaMint = exports.platformId = void 0;
4
4
  const web3_js_1 = require("@solana/web3.js");
5
5
  exports.platformId = 'sns';
6
6
  exports.fidaMint = 'EchesyfXePKdLtoiZSL8pBe8Myagyy8ZRqsACNCFGnvp';
@@ -16,6 +16,15 @@ exports.snsAirdropStatics = {
16
16
  claimLink: 'https://airdrop.sns.id/',
17
17
  claimStart: 1747137600000,
18
18
  claimEnd: 1754913600000,
19
- image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/debridge.webp',
19
+ image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/sns.webp',
20
+ };
21
+ exports.fidaAirdropStatics = {
22
+ emitterLink: 'https://bonfida.id/',
23
+ emitterName: 'bonfida',
24
+ id: 'bonfida-airdrop',
25
+ claimLink: 'https://www.bonfida.org/',
26
+ claimStart: 1718452800000,
27
+ claimEnd: 1723723200000,
28
+ image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/sns.webp',
20
29
  };
21
30
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,KAAK,CAAC;AACnB,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,yFAAyF,CAAC;AAC/E,QAAA,YAAY,GAAG,CAAC,CAAC;AAEjB,QAAA,OAAO,GAAG,6CAA6C,CAAC;AAExD,QAAA,iBAAiB,GAAmB;IAC/C,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,KAAK;IAClB,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,yBAAyB;IACpC,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,KAAK,EACH,8EAA8E;CACjF,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,KAAK,CAAC;AACnB,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,yFAAyF,CAAC;AAC/E,QAAA,YAAY,GAAG,CAAC,CAAC;AAEjB,QAAA,OAAO,GAAG,6CAA6C,CAAC;AAExD,QAAA,iBAAiB,GAAmB;IAC/C,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,KAAK;IAClB,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,yBAAyB;IACpC,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,KAAK,EACH,yEAAyE;CAC5E,CAAC;AAEW,QAAA,kBAAkB,GAAmB;IAChD,WAAW,EAAE,qBAAqB;IAClC,WAAW,EAAE,SAAS;IACtB,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,0BAA0B;IACrC,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,KAAK,EACH,yEAAyE;CAC5E,CAAC"}
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.airdropFetchers = exports.fetchers = exports.jobs = void 0;
7
7
  const offersFetcher_1 = __importDefault(require("./offersFetcher"));
8
- const airdropFetcher_1 = __importDefault(require("./airdropFetcher"));
8
+ const airdropFetcher_1 = require("./airdropFetcher");
9
9
  const snsAirdropFetcher_1 = require("./snsAirdropFetcher");
10
10
  exports.jobs = [];
11
- exports.fetchers = [offersFetcher_1.default, airdropFetcher_1.default, snsAirdropFetcher_1.fetcher];
12
- exports.airdropFetchers = [snsAirdropFetcher_1.airdropFetcher];
11
+ exports.fetchers = [offersFetcher_1.default, snsAirdropFetcher_1.fetcher];
12
+ exports.airdropFetchers = [snsAirdropFetcher_1.airdropFetcher, airdropFetcher_1.airdropFetcher];
13
13
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/index.ts"],"names":[],"mappings":";;;;;;AAEA,oEAA4C;AAC5C,sEAA8C;AAC9C,2DAG6B;AAEhB,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,uBAAa,EAAE,wBAAc,EAAE,2BAAO,CAAC,CAAC;AAE/D,QAAA,eAAe,GAAG,CAAC,kCAAiB,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/index.ts"],"names":[],"mappings":";;;;;;AAEA,oEAA4C;AAC5C,qDAAwE;AACxE,2DAG6B;AAEhB,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,uBAAa,EAAE,2BAAU,CAAC,CAAC;AAElD,QAAA,eAAe,GAAG,CAAC,kCAAiB,EAAE,+BAAkB,CAAC,CAAC"}
@@ -20,6 +20,7 @@ const clients_1 = require("../../utils/clients");
20
20
  const distributions_json_1 = __importDefault(require("./distributions.json"));
21
21
  const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
22
22
  const helpers_1 = require("./helpers");
23
+ const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
23
24
  const distributionByWallet = distributions_json_1.default;
24
25
  const executorDis1 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
25
26
  const isEvm = (0, portfolio_core_1.isEvmAddress)(owner);
@@ -28,6 +29,7 @@ const executorDis1 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
28
29
  ? (0, helpers_1.getEvmReceiptPdaBySeason)(owner, 1)
29
30
  : (0, helpers_1.getSolReceiptPdaBySeason)(owner, 1);
30
31
  const receipt = yield (0, clients_1.getClientSolana)().getAccountInfo(pda);
32
+ const claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, pda, constants_1.dbrMint);
31
33
  if (!walletDistributions || !walletDistributions.one) {
32
34
  return (0, AirdropFetcher_1.getAirdropRaw)({
33
35
  statics: constants_1.firstDistribStatics,
@@ -51,6 +53,8 @@ const executorDis1 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
51
53
  label: 'DBR',
52
54
  address: isEvm ? undefined : constants_1.dbrMint,
53
55
  imageUri: isEvm ? constants_1.dbrImg : undefined,
56
+ claims,
57
+ ref: pda.toString(),
54
58
  },
55
59
  ],
56
60
  });
@@ -63,6 +67,7 @@ const executorDis2 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
63
67
  : [(0, helpers_1.getSolReceiptPdaBySeason)(owner, 2), (0, helpers_1.getSolReceiptPdaBySeason)(owner, 3)];
64
68
  const receipts = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)((0, clients_1.getClientSolana)(), pdas);
65
69
  const isClaimed = receipts.some((receipt) => !!receipt);
70
+ const claims = yield Promise.all(pdas.map((pda) => (0, getClaimTransactions_1.getClaimTransactions)(owner, pda, constants_1.dbrMint)));
66
71
  if (!walletDistributions || !walletDistributions.two) {
67
72
  return (0, AirdropFetcher_1.getAirdropRaw)({
68
73
  statics: constants_1.secondDistribStatics,
@@ -86,6 +91,7 @@ const executorDis2 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
86
91
  label: 'DBR',
87
92
  address: isEvm ? undefined : constants_1.dbrMint,
88
93
  imageUri: isEvm ? constants_1.dbrImg : undefined,
94
+ claims: claims.flat(),
89
95
  },
90
96
  ],
91
97
  });
@@ -1 +1 @@
1
- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/debridge/airdropFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/debridge/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAqE;AAErE,yDAK8B;AAC9B,2CAMqB;AACrB,iDAAsD;AACtD,8EAAiD;AACjD,gGAA6F;AAC7F,uCAA+E;AAC/E,0FAAuF;AAEvF,MAAM,oBAAoB,GAAG,4BAK5B,CAAC;AAEF,MAAM,YAAY,GAA2B,CAAO,KAAa,EAAE,EAAE;IACnE,MAAM,KAAK,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAC;IAClC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,KAAK;QACf,CAAC,CAAC,IAAA,kCAAwB,EAAC,KAAK,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,IAAA,kCAAwB,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAEvC,MAAM,OAAO,GACX,MAAM,IAAA,yBAAe,GAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,GAAG,EAAE,mBAAO,CAAC,CAAC;IAE/D,IAAI,CAAC,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC;QACrD,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,+BAAmB;YAC5B,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,KAAK;oBACZ,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAO;oBACpC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,kBAAM,CAAC,CAAC,CAAC,SAAS;iBACrC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,+BAAmB;QAC5B,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,mBAAmB,CAAC,GAAG;gBAC/B,SAAS,EAAE,CAAC,CAAC,OAAO;gBACpB,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAO;gBACpC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,kBAAM,CAAC,CAAC,CAAC,SAAS;gBACpC,MAAM;gBACN,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;aACpB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,YAAY,GAA2B,CAAO,KAAa,EAAE,EAAE;IACnE,MAAM,KAAK,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAC;IAClC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,KAAK;QAChB,CAAC,CAAC,CAAC,IAAA,kCAAwB,EAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAA,kCAAwB,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC,IAAA,kCAAwB,EAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAA,kCAAwB,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7E,MAAM,QAAQ,GACZ,MAAM,IAAA,yDAA2B,EAAC,IAAA,yBAAe,GAAE,EAAE,IAAI,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,2CAAoB,EAAC,KAAK,EAAE,GAAG,EAAE,mBAAO,CAAC,CAAC,CAC7D,CAAC;IAEF,IAAI,CAAC,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC;QACrD,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,gCAAoB;YAC7B,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,KAAK;oBACZ,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAO;oBACpC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,kBAAM,CAAC,CAAC,CAAC,SAAS;iBACrC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,gCAAoB;QAC7B,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,mBAAmB,CAAC,GAAG;gBAC/B,SAAS;gBACT,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAO;gBACpC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,kBAAM,CAAC,CAAC,CAAC,SAAS;gBACpC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;aACtB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,qBAAqB,GAAmB;IACnD,EAAE,EAAE,GAAG,+BAAmB,CAAC,EAAE,MAAM;IACnC,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ,EAAE,YAAY;CACvB,CAAC;AAEW,QAAA,wBAAwB,GAAmB;IACtD,EAAE,EAAE,GAAG,+BAAmB,CAAC,EAAE,SAAS;IACtC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,YAAY;CACvB,CAAC;AAEW,QAAA,qBAAqB,GAAmB;IACnD,EAAE,EAAE,GAAG,gCAAoB,CAAC,EAAE,MAAM;IACpC,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ,EAAE,YAAY;CACvB,CAAC;AAEW,QAAA,wBAAwB,GAAmB;IACtD,EAAE,EAAE,GAAG,gCAAoB,CAAC,EAAE,SAAS;IACvC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,YAAY;CACvB,CAAC;AAEW,QAAA,WAAW,GAAG,IAAA,wCAAuB,EAChD,gCAAwB,EACxB,sBAAU,EACV,uBAAuB,EACvB,+BAAmB,CAAC,QAAQ,CAC7B,CAAC;AAEW,QAAA,WAAW,GAAG,IAAA,wCAAuB,EAChD,gCAAwB,EACxB,sBAAU,EACV,uBAAuB,EACvB,gCAAoB,CAAC,QAAQ,CAC9B,CAAC"}
@@ -44,7 +44,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
44
44
  if (!vaultInfo || new bignumber_js_1.default(vaultInfo.totalShares).isZero())
45
45
  continue;
46
46
  const { name, mint, platformId, link } = vaultInfo;
47
- const element = elementRegistry.addElementMultiple({
47
+ const element = elementRegistry.addElementLiquidity({
48
48
  label: 'Deposit',
49
49
  platformId,
50
50
  name,
@@ -57,36 +57,46 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
57
57
  ],
58
58
  ref: depositAccount.pubkey,
59
59
  });
60
+ const liquidity = element.addLiquidity();
60
61
  const pricePerShare = new bignumber_js_1.default(vaultInfo.totalTokens).dividedBy(vaultInfo.totalShares);
61
62
  const userSharesValue = depositAccount.vaultShares.multipliedBy(pricePerShare);
62
63
  const { netDeposits } = depositAccount;
63
64
  const performanceFee = new bignumber_js_1.default(vaultInfo.profitShare).shiftedBy(-6);
64
65
  const PnL = userSharesValue.minus(netDeposits);
65
- element.addAsset({
66
+ liquidity.addAsset({
66
67
  address: mint,
67
68
  amount: netDeposits.minus(((_a = depositAccount.lastWithdrawRequest) === null || _a === void 0 ? void 0 : _a.value) || 0),
68
69
  });
70
+ if (vaultInfo.apy90d) {
71
+ liquidity.addYield((0, portfolio_core_1.yieldFromApy)(vaultInfo.apy90d));
72
+ }
69
73
  let hasPendingFees = false;
70
74
  if (PnL.isPositive()) {
71
75
  const profitShareFees = PnL.multipliedBy(performanceFee).minus(depositAccount.profitShareFeePaid);
72
76
  if (profitShareFees.isPositive()) {
73
77
  hasPendingFees = true;
74
- element.addAsset({
78
+ liquidity.addAsset({
75
79
  address: mint,
76
80
  amount: profitShareFees.negated(),
77
81
  attributes: {
78
82
  tags: [`Pending ${performanceFee.shiftedBy(2)}% Performance Fee`],
79
83
  },
80
84
  });
85
+ if (vaultInfo.apy90d) {
86
+ liquidity.addYield((0, portfolio_core_1.yieldFromApy)(vaultInfo.apy90d));
87
+ }
81
88
  }
82
89
  }
83
- element.addAsset({
90
+ liquidity.addAsset({
84
91
  address: mint,
85
92
  amount: PnL,
86
93
  attributes: {
87
94
  tags: [hasPendingFees ? 'PnL before Fees' : 'PnL'],
88
95
  },
89
96
  });
97
+ if (vaultInfo.apy90d) {
98
+ liquidity.addYield((0, portfolio_core_1.yieldFromApy)(vaultInfo.apy90d));
99
+ }
90
100
  if (!((_b = depositAccount.lastWithdrawRequest) === null || _b === void 0 ? void 0 : _b.value.isZero())) {
91
101
  const withdrawCooldown = [
92
102
  constants_2.neutralPlatformId,
@@ -95,7 +105,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
95
105
  ].includes(platformId)
96
106
  ? exports.oneDay
97
107
  : exports.sevenDays;
98
- element.addAsset({
108
+ liquidity.addAsset({
99
109
  address: mint,
100
110
  amount: depositAccount.lastWithdrawRequest.value,
101
111
  attributes: {
@@ -105,6 +115,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
105
115
  .toNumber(),
106
116
  },
107
117
  });
118
+ if (vaultInfo.apy90d) {
119
+ liquidity.addYield((0, portfolio_core_1.yieldFromApy)(0));
120
+ }
108
121
  }
109
122
  }
110
123
  return elementRegistry.getElements(cache);
@@ -1 +1 @@
1
- {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift-market-maker-vault/depositsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift-market-maker-vault/depositsFetcher.ts"],"names":[],"mappings":"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"}
@@ -9,4 +9,5 @@ export type VaultInfo = {
9
9
  user: string;
10
10
  profitShare: number;
11
11
  link?: string;
12
+ apy90d?: number;
12
13
  };
@@ -8,8 +8,12 @@ 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");
16
+ const axios_1 = __importDefault(require("axios"));
13
17
  const clients_1 = require("../../utils/clients");
14
18
  const solana_1 = require("../../utils/solana");
15
19
  const constants_1 = require("../drift/constants");
@@ -18,7 +22,7 @@ const filters_1 = require("./filters");
18
22
  const helpers_1 = require("./helpers");
19
23
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
20
24
  const client = (0, clients_1.getClientSolana)();
21
- const [vaultIdsByProgram, spotMarkets] = yield Promise.all([
25
+ const [vaultIdsByProgram, spotMarkets, apys] = yield Promise.all([
22
26
  Promise.all(constants_2.vaultsProgramIds.map((vaultsPid) => client.getProgramAccounts(vaultsPid, {
23
27
  filters: filters_1.vaultFilter,
24
28
  dataSlice: { offset: 0, length: 0 },
@@ -27,6 +31,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
27
31
  prefix: constants_1.platformId,
28
32
  networkId: portfolio_core_1.NetworkId.solana,
29
33
  }),
34
+ axios_1.default.get(`https://app.drift.trade/api/vaults`),
30
35
  ]);
31
36
  if (!spotMarkets)
32
37
  return;
@@ -60,6 +65,9 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
60
65
  user: vault.user.toString(),
61
66
  profitShare: vault.profitShare,
62
67
  link,
68
+ apy90d: apys.data[pubkey]
69
+ ? apys.data[pubkey].apys['90d'] / 100
70
+ : undefined,
63
71
  };
64
72
  cachedItems.push({
65
73
  key: pubkey,
@@ -1 +1 @@
1
- {"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift-market-maker-vault/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,iDAAsD;AACtD,+CAAqD;AACrD,kDAG4B;AAC5B,2CAKqB;AACrB,uCAAwC;AAGxC,uCAA2C;AAG3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,CAAC,iBAAiB,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACzD,OAAO,CAAC,GAAG,CACT,4BAAgB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACjC,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE;YACnC,OAAO,EAAE,qBAAW;YACpB,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;SACpC,CAAC,CACH,CACF;QACD,KAAK,CAAC,OAAO,CAAuB,0BAAc,EAAE;YAClD,MAAM,EAAE,sBAAe;YACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW;QAAE,OAAO;IAEzB,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,4BAAgB,CAAC,CAAC,CAAC,CAAC;QAEtC,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAc,EAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAChE,CAAC;QAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CACjC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,KAAK,KAAK,CAAC,eAAe,CACjD,CAAC;YACF,IAAI,CAAC,UAAU;gBAAE,SAAS;YAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvC,IAAI,eAAe,GAAG,oCAAwB,CAAC,GAAG,CAChD,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CACzB,CAAC;YACF,IAAI,CAAC,eAAe;gBAAE,eAAe,GAAG,sBAAe,CAAC;YAExD,MAAM,IAAI,GAAG,6BAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACpD,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,kCAAkC,CAAC;gBACvE,KAAK;gBACL,mBAAmB,EAAE,IAAI;aAC1B,CAAC,CAAC;YAEH,MAAM,SAAS,GAAc;gBAC3B,MAAM;gBACN,UAAU,EAAE,eAAe;gBAC3B,IAAI,EAAE,IAAA,wBAAe,EAAC,KAAK,CAAC,IAAI,CAAC;gBACjC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAChC,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE;gBACzC,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;gBACnC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC3B,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,IAAI;aACL,CAAC;YAEF,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,EAAE,MAAM;gBACX,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,WAAW,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,CAAC,QAAQ,CAAY,WAAW,EAAE;QAC3C,MAAM,EAAE,wBAAY;QACpB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAe,sBAAsB;IAC5C,QAAQ;IACR,MAAM,EAAE,CAAC,UAAU,CAAC;CACrB,CAAC;AACF,kBAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift-market-maker-vault/vaultsJob.ts"],"names":[],"mappings":"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"}
@@ -16,13 +16,15 @@ const axios_1 = __importDefault(require("axios"));
16
16
  const portfolio_core_1 = require("@sonarwatch/portfolio-core");
17
17
  const constants_1 = require("./constants");
18
18
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
19
+ var _a, _b;
19
20
  const res = yield axios_1.default.get(constants_1.ptTokensApiUrl);
20
21
  /* const tokenPrices = await cache.getTokenPricesAsMap(
21
22
  res.data.data.map((ptToken) => ptToken.baseAssetMint),
22
23
  NetworkId.solana
23
24
  ); */
24
25
  const tokenPriceSources = [];
25
- res.data.data.forEach((ptToken) => {
26
+ const tokenYieldsSources = [];
27
+ for (const ptToken of res.data.data) {
26
28
  // const baseTokenPrice = tokenPrices.get(ptToken.baseAssetMint);
27
29
  const tokenPriceSource = {
28
30
  address: ptToken.mint,
@@ -37,6 +39,16 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
37
39
  label: 'Deposit',
38
40
  link: 'https://www.exponent.finance/income',
39
41
  };
42
+ const marketHistory = yield axios_1.default.get(`https://web-api.exponent.finance/api/market-history/${ptToken.marketAddress}`);
43
+ if ((_b = (_a = marketHistory.data.data) === null || _a === void 0 ? void 0 : _a.ptYield) === null || _b === void 0 ? void 0 : _b.week) {
44
+ const priceHistoryDatum = marketHistory.data.data.ptYield.week.reduce((max, item) => (item.t > max.t ? item : max));
45
+ tokenYieldsSources.push({
46
+ address: ptToken.mint,
47
+ networkId: portfolio_core_1.NetworkId.solana,
48
+ yield: (0, portfolio_core_1.yieldFromApy)(priceHistoryDatum.v),
49
+ timestamp: Date.now(),
50
+ });
51
+ }
40
52
  /* if (baseTokenPrice) {
41
53
  tokenPriceSource.underlyings = [
42
54
  {
@@ -49,8 +61,11 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
49
61
  ];
50
62
  } */
51
63
  tokenPriceSources.push(tokenPriceSource);
52
- });
53
- yield cache.setTokenPriceSources(tokenPriceSources);
64
+ }
65
+ yield Promise.all([
66
+ cache.setTokenPriceSources(tokenPriceSources),
67
+ cache.setTokenYields(tokenYieldsSources),
68
+ ]);
54
69
  });
55
70
  const job = {
56
71
  id: `${constants_1.platformId}-pt-prices`,
@@ -1 +1 @@
1
- {"version":3,"file":"ptPricesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/exponent/ptPricesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,+DAAyE;AAGzE,2CAAyD;AAGzD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAEJ,MAAM,eAAK,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;IAErC;;;SAGK;IAEL,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IAEjD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAChC,iEAAiE;QACjE,MAAM,gBAAgB,GAAqB;YACzC,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,EAAE,EAAE,OAAO,CAAC,aAAa;YACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,OAAO,CAAC,UAAU;YACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,QAAQ;YACrB,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,qCAAqC;SAC5C,CAAC;QACF;;;;;;;;;;YAUI;QAEJ,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;AACtD,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"ptPricesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/exponent/ptPricesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,+DAKoC;AAGpC,2CAAyD;AAQzD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,GAAG,GAEJ,MAAM,eAAK,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;IAErC;;;SAGK;IAEL,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IACjD,MAAM,kBAAkB,GAAiB,EAAE,CAAC;IAE5C,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpC,iEAAiE;QACjE,MAAM,gBAAgB,GAAqB;YACzC,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,EAAE,EAAE,OAAO,CAAC,aAAa;YACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,OAAO,CAAC,UAAU;YACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,QAAQ;YACrB,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,qCAAqC;SAC5C,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,eAAK,CAAC,GAAG,CAGnC,uDAAuD,OAAO,CAAC,aAAa,EAAE,CAC/E,CAAC;QAEF,IAAI,MAAA,MAAA,aAAa,CAAC,IAAI,CAAC,IAAI,0CAAE,OAAO,0CAAE,IAAI,EAAE,CAAC;YAC3C,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CACnE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAC7C,CAAC;YAEF,kBAAkB,CAAC,IAAI,CAAC;gBACtB,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;gBAC3B,KAAK,EAAE,IAAA,6BAAY,EAAC,iBAAiB,CAAC,CAAC,CAAC;gBACxC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC,CAAC;QACL,CAAC;QAED;;;;;;;;;;YAUI;QAEJ,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC;QAC7C,KAAK,CAAC,cAAc,CAAC,kBAAkB,CAAC;KACzC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}
@@ -45,7 +45,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
45
45
  const targetcustody = custodyById.get(market.targetCustody.toString());
46
46
  if (!colCustody || !targetcustody)
47
47
  continue;
48
- marketsInfo.push(Object.assign(Object.assign({}, market), { collateralCustodyAccount: colCustody, targetCustodyAccount: targetcustody }));
48
+ marketsInfo.push(Object.assign(Object.assign({}, market), { collateralCustodyAccount: Object.assign({ pubkey: market.collateralCustody.toString() }, colCustody), targetCustodyAccount: Object.assign({ pubkey: market.targetCustody.toString() }, targetcustody) }));
49
49
  }
50
50
  yield cache.setItem(constants_1.marketsKey, marketsInfo, {
51
51
  prefix: constants_1.platformId,
@@ -1 +1 @@
1
- {"version":3,"file":"custodiesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/custodiesJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"custodiesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/custodiesJob.ts"],"names":[],"mappings":"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"}
@@ -4,14 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.fetchers = exports.jobs = void 0;
7
- // import perpetualFetcher from './perpetualFetcher';
7
+ const perpetualFetcher_1 = __importDefault(require("./perpetualFetcher"));
8
8
  const custodiesJob_1 = __importDefault(require("./custodiesJob"));
9
- const poolJob_1 = __importDefault(require("./poolJob"));
9
+ const poolsJob_1 = __importDefault(require("./poolsJob"));
10
10
  const stakeFetcher_1 = __importDefault(require("./stakeFetcher"));
11
11
  const fafStakingFetcher_1 = __importDefault(require("./fafStakingFetcher"));
12
- exports.jobs = [custodiesJob_1.default, poolJob_1.default];
12
+ const poolsYieldJob_1 = __importDefault(require("./poolsYieldJob"));
13
+ exports.jobs = [custodiesJob_1.default, poolsJob_1.default, poolsYieldJob_1.default];
13
14
  exports.fetchers = [
14
- // perpetualFetcher,
15
+ perpetualFetcher_1.default,
15
16
  stakeFetcher_1.default,
16
17
  fafStakingFetcher_1.default,
17
18
  ];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/index.ts"],"names":[],"mappings":";;;;;;AAEA,qDAAqD;AACrD,kEAA0C;AAC1C,wDAAiC;AACjC,kEAA0C;AAC1C,4EAAoD;AAEvC,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,iBAAQ,CAAC,CAAC;AACvC,QAAA,QAAQ,GAAc;IACjC,oBAAoB;IACpB,sBAAY;IACZ,2BAAiB;CAClB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/index.ts"],"names":[],"mappings":";;;;;;AAEA,0EAAkD;AAClD,kEAA0C;AAC1C,0DAAkC;AAClC,kEAA0C;AAC1C,4EAAoD;AACpD,oEAA4C;AAE/B,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,kBAAQ,EAAE,uBAAa,CAAC,CAAC;AACtD,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,sBAAY;IACZ,2BAAiB;CAClB,CAAC"}