@sonarwatch/portfolio-plugins 0.15.27 → 0.15.28

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 (45) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/package.json +1 -1
  3. package/src/plugins/goosefx/dualPoolFetcher.js +10 -6
  4. package/src/plugins/goosefx/dualPoolFetcher.js.map +1 -1
  5. package/src/plugins/grass/airdropFetcher.js +13 -1
  6. package/src/plugins/grass/airdropFetcher.js.map +1 -1
  7. package/src/plugins/jupiter/exchange/limitFetcher.js +1 -1
  8. package/src/plugins/jupiter/exchange/limitFetcher.js.map +1 -1
  9. package/src/plugins/jupiter/index.js +1 -0
  10. package/src/plugins/jupiter/index.js.map +1 -1
  11. package/src/plugins/jupiter/launchpad/constants.js +2 -2
  12. package/src/plugins/jupiter/launchpad/constants.js.map +1 -1
  13. package/src/plugins/meteora/dlmm/dlmmVaultsFetcher.js +59 -61
  14. package/src/plugins/meteora/dlmm/dlmmVaultsFetcher.js.map +1 -1
  15. package/src/plugins/meteora/filters.d.ts +0 -3
  16. package/src/plugins/meteora/filters.js +1 -8
  17. package/src/plugins/meteora/filters.js.map +1 -1
  18. package/src/plugins/meteora/pools/poolsJob.js +15 -29
  19. package/src/plugins/meteora/pools/poolsJob.js.map +1 -1
  20. package/src/plugins/meteora/struct.d.ts +1 -16
  21. package/src/plugins/meteora/struct.js +14 -34
  22. package/src/plugins/meteora/struct.js.map +1 -1
  23. package/src/plugins/oresupply/boostJob.js +14 -4
  24. package/src/plugins/oresupply/boostJob.js.map +1 -1
  25. package/src/plugins/oresupply/stakeFetcher.js +8 -1
  26. package/src/plugins/oresupply/stakeFetcher.js.map +1 -1
  27. package/src/plugins/solayer/airdropFetcher.js +23 -20
  28. package/src/plugins/solayer/airdropFetcher.js.map +1 -1
  29. package/src/plugins/sonic/airdropFetcher.js +16 -14
  30. package/src/plugins/sonic/airdropFetcher.js.map +1 -1
  31. package/src/plugins/sonic/structs.d.ts +7 -0
  32. package/src/plugins/sonic/structs.js +7 -1
  33. package/src/plugins/sonic/structs.js.map +1 -1
  34. package/src/plugins/streamflow/constants.d.ts +1 -0
  35. package/src/plugins/streamflow/constants.js +2 -1
  36. package/src/plugins/streamflow/constants.js.map +1 -1
  37. package/src/plugins/streamflow/helpers.js +2 -2
  38. package/src/plugins/streamflow/helpers.js.map +1 -1
  39. package/src/plugins/streamflow/merkleFetcher.js +16 -15
  40. package/src/plugins/streamflow/merkleFetcher.js.map +1 -1
  41. package/src/plugins/streamflow/types.d.ts +9 -0
  42. package/src/plugins/tensor/airdropPowerUsersFetcher.js +1 -1
  43. package/src/plugins/tensor/constants.d.ts +1 -1
  44. package/src/plugins/tensor/constants.js +2 -2
  45. package/src/plugins/tensor/powerUserAirdropFetcher.js +1 -1
package/CHANGELOG.md CHANGED
@@ -2,6 +2,24 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [0.15.28](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.27...plugins-0.15.28) (2025-06-12)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * correct variable name ([d22beb9](https://github.com/sonarwatch/portfolio/commit/d22beb9fa29220b37f2abade6d1f13180204f0ed))
11
+ * **jupiter:** replace `isPositive` with `isGreaterThan(0)` for sl_taking_amount check in limitFetcher ([824952c](https://github.com/sonarwatch/portfolio/commit/824952c9f6ec3a0cc5459d37179641252a498fc1))
12
+ * **plugins:** prevent processing of accounts with zero LP tokens ([23cfc2e](https://github.com/sonarwatch/portfolio/commit/23cfc2ef35a2432489d2a8fe8c944e9762bc907d))
13
+ * **plugins:** update liquidity calculation in dualPoolFetcher ([99068cf](https://github.com/sonarwatch/portfolio/commit/99068cf366fe68b7f9d847cb1049344d539f756a))
14
+
15
+
16
+ ### Features
17
+
18
+ * **plugins:** add claims and remove API call ([6768d7c](https://github.com/sonarwatch/portfolio/commit/6768d7c46f8118ad3faee3277ca948fa554fe38c))
19
+ * **plugins:** enhance grass and solayer airdropFetchers with claim transactions ([19f07c1](https://github.com/sonarwatch/portfolio/commit/19f07c129e750b2df9a85195e2b045efba3fa9d5))
20
+
21
+
22
+
5
23
  ## [0.15.27](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.26...plugins-0.15.27) (2025-06-05)
6
24
 
7
25
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.15.27",
3
+ "version": "0.15.28",
4
4
  "type": "commonjs",
5
5
  "types": "./src/index.d.ts",
6
6
  "peerDependencies": {
@@ -31,6 +31,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
31
31
  });
32
32
  const registry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
33
33
  for (const account of userLiquidities) {
34
+ if (account.lpTokensOwned.isZero())
35
+ continue;
34
36
  const poolState = cachedPoolStates.find((pool) => (pool === null || pool === void 0 ? void 0 : pool.pubkey.toString()) === account.poolState.toString());
35
37
  if (!poolState)
36
38
  continue;
@@ -40,19 +42,21 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
40
42
  sourceRefs: [{ address: poolState.pubkey.toString(), name: 'Pool' }],
41
43
  link: 'https://app.goosefx.io/gamma',
42
44
  });
45
+ const token0Amount = account.lpTokensOwned
46
+ .times(poolState.token0VaultAmount)
47
+ .dividedBy(poolState.lpSupply);
43
48
  const liq = liqElement.addLiquidity({});
44
49
  liq.addAsset({
45
50
  address: poolState.token0Mint.toString(),
46
- amount: account.token0Deposited
47
- .minus(account.token0Withdrawn)
48
- .dividedBy(Math.pow(10, poolState.mint0Decimals)),
51
+ amount: token0Amount.dividedBy(Math.pow(10, poolState.mint0Decimals)),
49
52
  alreadyShifted: true,
50
53
  });
54
+ const token1Amount = account.lpTokensOwned
55
+ .times(poolState.token1VaultAmount)
56
+ .dividedBy(poolState.lpSupply);
51
57
  liq.addAsset({
52
58
  address: poolState.token1Mint.toString(),
53
- amount: account.token1Deposited
54
- .minus(account.token1Withdrawn)
55
- .dividedBy(Math.pow(10, poolState.mint1Decimals)),
59
+ amount: token1Amount.dividedBy(Math.pow(10, poolState.mint1Decimals)),
56
60
  alreadyShifted: true,
57
61
  });
58
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"dualPoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/dualPoolFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dualPoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/dualPoolFetcher.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,7 @@ const AirdropFetcher_1 = require("../../AirdropFetcher");
19
19
  const constants_1 = require("./constants");
20
20
  const clients_1 = require("../../utils/clients");
21
21
  const helpers_1 = require("./helpers");
22
+ const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
22
23
  const distributor = '6op4vvD7he9Nqs6eXCQvRmDtGYzMkRoDYcFUfF7pK5YS';
23
24
  const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
24
25
  const walletAddress = owner;
@@ -46,10 +47,21 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
46
47
  const client = (0, clients_1.getClientSolana)();
47
48
  const claimStatus = (0, helpers_1.deriveClaimStatus)(owner, distributor);
48
49
  const claimAccount = yield client.getAccountInfo(claimStatus);
50
+ let claims = [];
51
+ if (claimAccount) {
52
+ claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, claimStatus, constants_1.grassMint);
53
+ }
49
54
  return (0, AirdropFetcher_1.getAirdropRaw)({
50
55
  statics: constants_1.airdropStatics,
51
56
  items: [
52
- { amount, isClaimed: !!claimAccount, label: 'GRASS', address: constants_1.grassMint },
57
+ {
58
+ amount,
59
+ isClaimed: !!claimAccount,
60
+ label: 'GRASS',
61
+ address: constants_1.grassMint,
62
+ claims,
63
+ ref: claimAccount ? claimStatus.toString() : undefined,
64
+ },
53
65
  ],
54
66
  });
55
67
  });
@@ -1 +1 @@
1
- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/grass/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,yDAK8B;AAC9B,2CAAgF;AAEhF,iDAAsD;AACtD,uCAA8C;AAE9C,MAAM,WAAW,GAAG,8CAA8C,CAAC;AACnE,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,aAAa,GAAG,KAAK,CAAC;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,0BAA0B;IAE3E,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAmC,MAAM,eAAK,CAAC,GAAG,CACzD,sBAAU,GAAG,YAAY,CAC1B,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;QACvB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,2BAAiB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9D,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,qBAAS,EAAE;SAC1E;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AACW,QAAA,SAAS,GAAG,IAAA,wCAAuB,EAC9C,wBAAgB,EAChB,sBAAU,EACV,eAAe,EACf,0BAAc,CAAC,QAAQ,CACxB,CAAC"}
1
+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/grass/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAA8D;AAC9D,kDAA6C;AAC7C,yDAK8B;AAC9B,2CAAgF;AAEhF,iDAAsD;AACtD,uCAA8C;AAC9C,0FAAuF;AAEvF,MAAM,WAAW,GAAG,8CAA8C,CAAC;AACnE,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,aAAa,GAAG,KAAK,CAAC;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,0BAA0B;IAE3E,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAmC,MAAM,eAAK,CAAC,GAAG,CACzD,sBAAU,GAAG,YAAY,CAC1B,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;QACvB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,2BAAiB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9D,IAAI,MAAM,GAAY,EAAE,CAAC;IACzB,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,WAAW,EAAE,qBAAS,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM;gBACN,SAAS,EAAE,CAAC,CAAC,YAAY;gBACzB,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,MAAM;gBACN,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;aACvD;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AACW,QAAA,SAAS,GAAG,IAAA,wCAAuB,EAC9C,wBAAgB,EAChB,sBAAU,EACV,eAAe,EACf,0BAAc,CAAC,QAAQ,CACxB,CAAC"}
@@ -88,7 +88,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
88
88
  const initialInputAmount = orderAcc.oriMakingAmount
89
89
  .div(Math.pow(10, inputDecimals))
90
90
  .toNumber();
91
- const expectedOutputAmount = (accountv2 && accountv2.sl_taking_amount.isPositive()
91
+ const expectedOutputAmount = (accountv2 && accountv2.sl_taking_amount.isGreaterThan(0)
92
92
  ? accountv2.sl_taking_amount
93
93
  : orderAcc.oriTakingAmount)
94
94
  .div(Math.pow(10, outputDecimals))
@@ -1 +1 @@
1
- {"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/limitFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/limitFetcher.ts"],"names":[],"mappings":"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"}
@@ -24,6 +24,7 @@ exports.fetchers = [
24
24
  lockFetcher_1.default,
25
25
  voteFetcher_1.default,
26
26
  governance_1.asr4Fetcher,
27
+ ...launchpad_1.lfgFetchers,
27
28
  ];
28
29
  exports.airdropFetchers = [
29
30
  governance_1.asr1AirdropFetcher,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/index.ts"],"names":[],"mappings":";;;;;;AAEA,mFAA2D;AAC3D,yFAAiE;AACjE,2EAAmD;AACnD,uEAA+C;AAC/C,yEAAiD;AACjD,2EAAmD;AAEnD,2EAAmD;AACnD,8DAAsC;AAEtC,6CAMsB;AACtB,2CAAiD;AACjD,gEAAwC;AAE3B,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,qBAAW,EAAE,oBAAU,CAAC,CAAC;AACtD,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,6BAAmB;IACnB,sBAAY;IACZ,oBAAU;IACV,qBAAW;IACX,qBAAW;IACX,wBAAW;CACZ,CAAC;AACW,QAAA,eAAe,GAAqB;IAC/C,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,GAAG,8BAAkB;CACtB,CAAC;AAEW,QAAA,aAAa,GAAG;IAC3B,0BAAgB,CAAC,EAAE;IACnB,6BAAmB,CAAC,EAAE;IACtB,sBAAY,CAAC,EAAE;IACf,oBAAU,CAAC,EAAE;IACb,qBAAW,CAAC,EAAE;IACd,qBAAW,CAAC,EAAE;CACf,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/index.ts"],"names":[],"mappings":";;;;;;AAEA,mFAA2D;AAC3D,yFAAiE;AACjE,2EAAmD;AACnD,uEAA+C;AAC/C,yEAAiD;AACjD,2EAAmD;AAEnD,2EAAmD;AACnD,8DAAsC;AAEtC,6CAMsB;AACtB,2CAA8D;AAC9D,gEAAwC;AAE3B,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,qBAAW,EAAE,oBAAU,CAAC,CAAC;AACtD,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,6BAAmB;IACnB,sBAAY;IACZ,oBAAU;IACV,qBAAW;IACX,qBAAW;IACX,wBAAW;IACX,GAAG,uBAAW;CACf,CAAC;AACW,QAAA,eAAe,GAAqB;IAC/C,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,GAAG,8BAAkB;CACtB,CAAC;AAEW,QAAA,aAAa,GAAG;IAC3B,0BAAgB,CAAC,EAAE;IACnB,6BAAmB,CAAC,EAAE;IACtB,sBAAY,CAAC,EAAE;IACf,oBAAU,CAAC,EAAE;IACb,qBAAW,CAAC,EAAE;IACd,qBAAW,CAAC,EAAE;CACf,CAAC"}
@@ -140,8 +140,8 @@ exports.airdropConfigs = [
140
140
  platformId: constants_1.platformId,
141
141
  getApiPath: (owner) => `https://api.kamino.finance/distributor/user/${owner}`,
142
142
  statics: {
143
- claimStart: 1724158800000,
144
- claimEnd: 1733130000000,
143
+ claimStart: 1748520000000,
144
+ claimEnd: undefined,
145
145
  id: 'kamino-s3',
146
146
  emitterName: 'Kamino',
147
147
  emitterLink: 'https://app.kamino.finance/',
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/constants.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/constants.ts"],"names":[],"mappings":";;;AACA,sDAAwE;AACxE,4CAA4C;AAE/B,QAAA,UAAU,GAAG,mBAAmB,CAAC;AAC9C,MAAM,aAAa,GAAG,gDAAgD,CAAC;AAE1D,QAAA,aAAa,GAAG,uCAAuC,CAAC;AACxD,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAE/D,QAAA,cAAc,GAAoB;IAC7C;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,6CAA6C;QACjE,KAAK,EAAE,KAAK;QACZ,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,wBAAY,aAAZ,wBAAY,cAAZ,wBAAY,GAAI,EAClB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,qBAAqB;YACzB,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,SAAS;YACtB,WAAW,EAAE,iBAAiB;YAC9B,SAAS,EAAE,wBAAwB;YACnC,KAAK,EAAE,aAAa;SACrB;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,MAAM;QACb,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,wBAAY,aAAZ,wBAAY,cAAZ,wBAAY,GAAI,EAClB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,UAAU;YACd,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,0BAA0B;YACvC,SAAS,EAAE,yBAAyB;YACpC,KAAK,EACH,0EAA0E;SAC7E;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,MAAM;QACb,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,wBAAY,aAAZ,wBAAY,cAAZ,wBAAY,GAAI,EAClB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,YAAY;YAChB,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,2BAA2B;YACxC,SAAS,EAAE,2BAA2B;YACtC,KAAK,EACH,4EAA4E;SAC/E;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,QAAQ;QACf,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,wBAAY,aAAZ,wBAAY,cAAZ,wBAAY,GAAI,EAClB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,YAAY;YAChB,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,oBAAoB;YACjC,SAAS,EAAE,2BAA2B;YACtC,KAAK,EACH,4EAA4E;SAC/E;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,KAAK;QACZ,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,wBAAY,aAAZ,wBAAY,cAAZ,wBAAY,GAAI,EAClB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,YAAY;YAChB,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,qBAAqB;YAClC,SAAS,EAAE,2BAA2B;YACtC,KAAK,EACH,4EAA4E;SAC/E;KACF;IACD,IAAI;IACJ,yDAAyD;IACzD,iBAAiB;IACjB,uEAAuE;IACvE,mBAAmB;IACnB,kCAAkC;IAClC,mCAAmC;IACnC,8DAA8D;IAC9D,eAAe;IACf,iCAAiC;IACjC,+BAA+B;IAC/B,uBAAuB;IACvB,6BAA6B;IAC7B,kDAAkD;IAClD,gEAAgE;IAChE,aAAa;IACb,sFAAsF;IACtF,kBAAkB;IAClB,OAAO;IACP,KAAK;IACL;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,8CAA8C;QAClE,KAAK,EAAE,KAAK;QACZ,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,+CAA+C,KAAK,IAClD,wBAAY,aAAZ,wBAAY,cAAZ,wBAAY,GAAI,EAClB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,iCAAiC;YACrC,WAAW,EAAE,SAAS;YACtB,WAAW,EAAE,iBAAiB;YAC9B,SAAS,EAAE,yBAAyB;YACpC,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,cAAc;SACrB;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,6CAA6C;QACjE,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,sBAAgB;QAC5B,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,+CAA+C,KAAK,EAAE;QACxD,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,SAAS;YACnB,EAAE,EAAE,WAAW;YACf,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,6BAA6B;YAC1C,SAAS,EAAE,6CAA6C;YACxD,KAAK,EACH,4EAA4E;YAC9E,IAAI,EAAE,IAAI;SACX;KACF;CACF,CAAC"}
@@ -24,7 +24,7 @@ const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry
24
24
  // const slotTtl = 30000;
25
25
  // const slot: number | null = null;
26
26
  // const slotUpdate = 0;
27
- const dustFilter = 0.00001;
27
+ const dustFilter = 0.0001;
28
28
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
29
29
  const client = (0, clients_1.getClientSolana)();
30
30
  const accounts = yield (0, solana_1.getParsedProgramAccounts)(client, struct_1.escrowStruct, constants_1.dlmmVaultProgramId, [
@@ -44,6 +44,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
44
44
  });
45
45
  if (!vaults)
46
46
  throw new Error('Vaults not cached');
47
+ const tokenPrices = yield cache.getTokenPricesAsMap(Object.values(vaults)
48
+ .map((v) => v && [v.baseMint, v.quoteMint])
49
+ .flat(), portfolio_core_1.NetworkId.solana);
47
50
  const time = Date.now();
48
51
  // Looks like Meteora is using timesteamp instead of slot now inside their accounts
49
52
  // if (!slot || Date.now() - slotTtl > slotUpdate) {
@@ -52,11 +55,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
52
55
  // }
53
56
  // if (!slot) return [];
54
57
  const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
55
- accounts.forEach((escrow) => {
58
+ for (const escrow of accounts) {
56
59
  const vault = vaults[escrow.dlmmVault.toString()];
57
60
  if (!vault || !vault.endVestingTs || !vault.startVestingTs)
58
- return;
59
- // if (time > Number(vault.endVestingTs)) return;
61
+ continue;
60
62
  const element = elementRegistry.addElementMultiple({
61
63
  label: 'Vesting',
62
64
  name: 'Alpha Vault',
@@ -73,72 +75,68 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
73
75
  ],
74
76
  link: `https://app.meteora.ag/dlmm/${vault.lbPair}`,
75
77
  });
76
- // Vesting not started yet
77
- if (time < Number(vault.startVestingTs) * 1000 && escrow.refunded === 0) {
78
- element.addAsset({
79
- address: vault.quoteMint,
80
- amount: escrow.totalDeposit,
81
- });
78
+ const baseTokenPrice = tokenPrices.get(vault.baseMint);
79
+ const quoteTokenPrice = tokenPrices.get(vault.quoteMint);
80
+ const filledRatio = new bignumber_js_1.default(vault.totalDeposit)
81
+ .div(vault.maxCap)
82
+ .toNumber();
83
+ if (escrow.refunded === 0 && filledRatio > 1) {
84
+ const amount = new bignumber_js_1.default(escrow.totalDeposit).times(1 - 1 / filledRatio);
85
+ if (quoteTokenPrice &&
86
+ amount
87
+ .shiftedBy(-quoteTokenPrice.decimals)
88
+ .multipliedBy(quoteTokenPrice.price)
89
+ .isGreaterThan(dustFilter)) {
90
+ element.addAsset({
91
+ address: vault.quoteMint,
92
+ amount,
93
+ attributes: {
94
+ isClaimable: true,
95
+ },
96
+ });
97
+ }
98
+ }
99
+ const shares = new bignumber_js_1.default(escrow.totalDeposit).div(vault.totalDeposit);
100
+ const totalAmount = new bignumber_js_1.default(vault.boughtToken).times(shares);
101
+ const remainingAmount = totalAmount.minus(escrow.claimedToken);
102
+ if (remainingAmount.isLessThan(dustFilter))
103
+ continue;
104
+ let claimableAmount = new bignumber_js_1.default(remainingAmount.toString());
105
+ if (time < Number(vault.endVestingTs)) {
106
+ const amountPerSec = new bignumber_js_1.default(totalAmount).div(Number(vault.endVestingTs) - Number(vault.startVestingTs));
107
+ let lastClaimedTs = escrow.lastClaimedTs.isZero()
108
+ ? Number(vault.startVestingTs)
109
+ : escrow.lastClaimedTs.toNumber();
110
+ if (lastClaimedTs > time)
111
+ lastClaimedTs = time;
112
+ claimableAmount = amountPerSec.times(Math.min(time, Number(vault.endVestingTs)) - lastClaimedTs);
82
113
  }
83
- else if (vault.startVestingTs === vault.endVestingTs) {
84
- // Unlock immediately after endVesting
85
- const shares = new bignumber_js_1.default(escrow.totalDeposit).div(vault.totalDeposit);
86
- const totalAmount = new bignumber_js_1.default(vault.boughtToken).times(shares);
114
+ if (baseTokenPrice &&
115
+ claimableAmount
116
+ .shiftedBy(-baseTokenPrice.decimals)
117
+ .multipliedBy(baseTokenPrice.price)
118
+ .isGreaterThan(dustFilter)) {
87
119
  element.addAsset({
88
120
  address: vault.baseMint,
89
- amount: totalAmount,
121
+ amount: claimableAmount,
90
122
  attributes: {
123
+ isClaimable: Number(vault.endVestingTs) * 1000 < Date.now(),
91
124
  lockedUntil: Number(vault.endVestingTs) * 1000,
92
125
  },
93
126
  });
94
127
  }
95
- else {
96
- // Vesting started
97
- // If not refunded yet
98
- const filledRatio = new bignumber_js_1.default(vault.totalDeposit)
99
- .div(vault.maxCap)
100
- .toNumber();
101
- if (escrow.refunded === 0 && filledRatio > 1) {
102
- const amount = new bignumber_js_1.default(escrow.totalDeposit).times(1 - 1 / filledRatio);
103
- if (amount.isGreaterThan(dustFilter))
104
- element.addAsset({
105
- address: vault.quoteMint,
106
- amount,
107
- });
108
- }
109
- const shares = new bignumber_js_1.default(escrow.totalDeposit).div(vault.totalDeposit);
110
- const totalAmount = new bignumber_js_1.default(vault.boughtToken).times(shares);
111
- const remainingAmount = totalAmount.minus(escrow.claimedToken);
112
- if (remainingAmount.isLessThan(dustFilter))
113
- return;
114
- let claimableAmount = new bignumber_js_1.default(remainingAmount.toString());
115
- if (time < Number(vault.endVestingTs)) {
116
- const amountPerSec = new bignumber_js_1.default(totalAmount).div(Number(vault.endVestingTs) - Number(vault.startVestingTs));
117
- let lastClaimedTs = escrow.lastClaimedTs.isZero()
118
- ? Number(vault.startVestingTs)
119
- : escrow.lastClaimedTs.toNumber();
120
- if (lastClaimedTs > time)
121
- lastClaimedTs = time;
122
- claimableAmount = amountPerSec.times(Math.min(time, Number(vault.endVestingTs)) - lastClaimedTs);
123
- }
124
- if (claimableAmount.isGreaterThan(dustFilter)) {
125
- element.addAsset({
126
- address: vault.baseMint,
127
- amount: claimableAmount,
128
- attributes: {
129
- isClaimable: true,
130
- },
131
- });
132
- }
133
- const vestingAmount = remainingAmount.minus(claimableAmount);
134
- if (vestingAmount.isGreaterThan(dustFilter)) {
135
- element.addAsset({
136
- address: vault.baseMint,
137
- amount: vestingAmount,
138
- });
139
- }
128
+ const vestingAmount = remainingAmount.minus(claimableAmount);
129
+ if (baseTokenPrice &&
130
+ vestingAmount
131
+ .shiftedBy(-baseTokenPrice.decimals)
132
+ .multipliedBy(baseTokenPrice.price)
133
+ .isGreaterThan(dustFilter)) {
134
+ element.addAsset({
135
+ address: vault.baseMint,
136
+ amount: vestingAmount,
137
+ });
140
138
  }
141
- });
139
+ }
142
140
  return elementRegistry.getElements(cache);
143
141
  });
144
142
  const fetcher = {
@@ -1 +1 @@
1
- {"version":3,"file":"dlmmVaultsFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/dlmm/dlmmVaultsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dlmmVaultsFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/dlmm/dlmmVaultsFetcher.ts"],"names":[],"mappings":"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"}
@@ -2,9 +2,6 @@
2
2
  /// <reference types="jito-ts/node_modules/@solana/web3.js" />
3
3
  import { GetProgramAccountsFilter } from '@solana/web3.js';
4
4
  export declare const vaultsFilters: GetProgramAccountsFilter[];
5
- export declare const constantPoolsFilters: GetProgramAccountsFilter[];
6
- export declare const stablePoolsFilters: GetProgramAccountsFilter[];
7
- export declare const memePoolsFilters: GetProgramAccountsFilter[];
8
5
  export declare const farmAccountFilter: (owner: string) => GetProgramAccountsFilter[];
9
6
  export declare const stakeEscrowFilter: (owner: string) => GetProgramAccountsFilter[];
10
7
  export declare const feeVaultFilter: () => GetProgramAccountsFilter[];
@@ -1,14 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.unstakeFilter = exports.feeVaultFilter = exports.stakeEscrowFilter = exports.farmAccountFilter = exports.memePoolsFilters = exports.stablePoolsFilters = exports.constantPoolsFilters = exports.vaultsFilters = void 0;
3
+ exports.unstakeFilter = exports.feeVaultFilter = exports.stakeEscrowFilter = exports.farmAccountFilter = exports.vaultsFilters = void 0;
4
4
  exports.vaultsFilters = [{ dataSize: 10240 }];
5
- exports.constantPoolsFilters = [
6
- { dataSize: 944 },
7
- ];
8
- exports.stablePoolsFilters = [
9
- { dataSize: 1387 },
10
- ];
11
- exports.memePoolsFilters = [{ dataSize: 952 }];
12
5
  const farmAccountFilter = (owner) => [
13
6
  { dataSize: 200 },
14
7
  {
@@ -1 +1 @@
1
- {"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/filters.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAA+B,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAElE,QAAA,oBAAoB,GAA+B;IAC9D,EAAE,QAAQ,EAAE,GAAG,EAAE;CAClB,CAAC;AAEW,QAAA,kBAAkB,GAA+B;IAC5D,EAAE,QAAQ,EAAE,IAAI,EAAE;CACnB,CAAC;AAEW,QAAA,gBAAgB,GAA+B,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;AAEzE,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B,EAAE,QAAQ,EAAE,GAAG,EAAE;IACjB;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;CACF,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEK,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEK,MAAM,cAAc,GAAG,GAA+B,EAAE,CAAC;IAC9D;QACE,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,aAAa,GAAG,CAC3B,WAAmB,EACS,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,WAAW;SACnB;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,aAAa,iBAYxB"}
1
+ {"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/filters.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAA+B,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAExE,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B,EAAE,QAAQ,EAAE,GAAG,EAAE;IACjB;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;CACF,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEK,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEK,MAAM,cAAc,GAAG,GAA+B,EAAE,CAAC;IAC9D;QACE,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,aAAa,GAAG,CAC3B,WAAmB,EACS,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,WAAW;SACnB;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,aAAa,iBAYxB"}
@@ -13,41 +13,27 @@ const constants_1 = require("../constants");
13
13
  const clients_1 = require("../../../utils/clients");
14
14
  const solana_1 = require("../../../utils/solana");
15
15
  const struct_1 = require("../struct");
16
- const filters_1 = require("../filters");
17
16
  const helpers_1 = require("../helpers");
18
- const poolsConfigs = [
19
- {
20
- pid: constants_1.poolsProgramId,
21
- struct: struct_1.poolStateStruct,
22
- filter: filters_1.constantPoolsFilters,
23
- },
24
- {
25
- pid: constants_1.poolsProgramId,
26
- struct: struct_1.poolStateStruct,
27
- filter: filters_1.stablePoolsFilters,
28
- },
29
- {
30
- pid: constants_1.poolsProgramId,
31
- struct: struct_1.poolStateV2Struct,
32
- filter: filters_1.memePoolsFilters,
33
- },
34
- ];
35
17
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
36
18
  const client = (0, clients_1.getClientSolana)();
37
19
  const step = 100;
38
20
  const sources = [];
39
- let poolsPubKeys;
21
+ const poolsPubKeys = (yield client.getProgramAccounts(constants_1.poolsProgramId, {
22
+ filters: [
23
+ {
24
+ memcmp: {
25
+ offset: 0,
26
+ bytes: 'hQrXeCntzbV',
27
+ },
28
+ },
29
+ ],
30
+ dataSlice: { length: 0, offset: 0 },
31
+ })).map((acc) => acc.pubkey);
40
32
  let poolsAccounts;
41
- for (const poolConfig of poolsConfigs) {
42
- poolsPubKeys = (yield client.getProgramAccounts(poolConfig.pid, {
43
- filters: [...poolConfig.filter],
44
- dataSlice: { length: 0, offset: 0 },
45
- })).map((acc) => acc.pubkey);
46
- for (let offset = 0; offset < poolsPubKeys.length; offset += step) {
47
- poolsAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, poolConfig.struct, poolsPubKeys.slice(offset, offset + step).map((key) => key));
48
- const lpSources = yield (0, helpers_1.getLpTokenPricesFromPoolsStates)(client, cache, poolsAccounts);
49
- sources.push(...lpSources);
50
- }
33
+ for (let offset = 0; offset < poolsPubKeys.length; offset += step) {
34
+ poolsAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.poolStateStruct, poolsPubKeys.slice(offset, offset + step).map((key) => key));
35
+ const lpSources = yield (0, helpers_1.getLpTokenPricesFromPoolsStates)(client, cache, poolsAccounts);
36
+ sources.push(...lpSources);
51
37
  }
52
38
  yield cache.setTokenPriceSources(sources);
53
39
  });
@@ -1 +1 @@
1
- {"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/pools/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,4CAA0D;AAC1D,oDAAyD;AACzD,kDAG+B;AAC/B,sCAA0E;AAC1E,wCAIoB;AAGpB,wCAA6D;AAE7D,MAAM,YAAY,GAAG;IACnB;QACE,GAAG,EAAE,0BAAc;QACnB,MAAM,EAAE,wBAAe;QACvB,MAAM,EAAE,8BAAoB;KAC7B;IACD;QACE,GAAG,EAAE,0BAAc;QACnB,MAAM,EAAE,wBAAe;QACvB,MAAM,EAAE,4BAAkB;KAC3B;IACD;QACE,GAAG,EAAE,0BAAc;QACnB,MAAM,EAAE,0BAAiB;QACzB,MAAM,EAAE,0BAAgB;KACzB;CACF,CAAC;AAEF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC;IAEjB,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,IAAI,YAAyB,CAAC;IAC9B,IAAI,aAAkD,CAAC;IACvD,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;QACtC,YAAY,GAAG,CACb,MAAM,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE;YAC9C,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;YAC/B,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;SACpC,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE3B,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;YAClE,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACjD,MAAM,EACN,UAAU,CAAC,MAAM,EACjB,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAC5D,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,IAAA,yCAA+B,EACrD,MAAM,EACN,KAAK,EACL,aAAa,CACd,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/pools/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,4CAA0D;AAC1D,oDAAyD;AACzD,kDAG+B;AAC/B,sCAAuD;AAGvD,wCAA6D;AAE7D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC;IAEjB,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,MAAM,YAAY,GAAG,CACnB,MAAM,MAAM,CAAC,kBAAkB,CAAC,0BAAc,EAAE;QAC9C,OAAO,EAAE;YACP;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,aAAa;iBACrB;aACF;SACF;QACD,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;KACpC,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAE3B,IAAI,aAAkD,CAAC;IAEvD,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;QAClE,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACjD,MAAM,EACN,wBAAe,EACf,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAC5D,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,IAAA,yCAA+B,EACrD,MAAM,EACN,KAAK,EACL,aAAa,CACd,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
@@ -97,7 +97,7 @@ export type PartnerInfo = {
97
97
  };
98
98
  export declare const partnerInfoStruct: BeetStruct<PartnerInfo, Partial<PartnerInfo>>;
99
99
  export type PoolState = {
100
- buffer: Buffer;
100
+ accountDiscriminator: number[];
101
101
  lpMint: PublicKey;
102
102
  tokenAMint: PublicKey;
103
103
  tokenBMint: PublicKey;
@@ -107,23 +107,8 @@ export type PoolState = {
107
107
  bVaultLp: PublicKey;
108
108
  aVaultLpBump: number;
109
109
  enabled: boolean;
110
- adminTokenAFee: PublicKey;
111
- adminTokenBFee: PublicKey;
112
- admin: PublicKey;
113
- feeLastUpdatedAt?: BigNumber;
114
- padding0?: number[];
115
- fees: PoolFees;
116
- poolType: PoolType;
117
- stake: PublicKey;
118
- totalLockedLp?: BigNumber;
119
- bootstrapping?: Boostrapping;
120
- partnerInfo?: PartnerInfo;
121
- padding2?: Padding2;
122
- padding: Padding;
123
- curveType: CurveType;
124
110
  };
125
111
  export declare const poolStateStruct: FixableBeetStruct<PoolState, Partial<PoolState>>;
126
- export declare const poolStateV2Struct: FixableBeetStruct<PoolState, Partial<PoolState>>;
127
112
  export type Farm = {
128
113
  buffer: Buffer;
129
114
  authority: PublicKey;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.escrowStruct = exports.farmAccountStruct = exports.farmStruct = exports.poolStateV2Struct = exports.poolStateStruct = exports.partnerInfoStruct = exports.boostrappingStruct = exports.poolFeesStruct = exports.PoolType = exports.CurveType = exports.stableParamsStruct = exports.TokenMultiplierStruct = exports.depegStruct = exports.DepegType = exports.padding2Struct = exports.paddingStruct = exports.vaultStruct = exports.lockedProfitTrackerStruct = exports.vaultBumpsStruct = void 0;
3
+ exports.escrowStruct = exports.farmAccountStruct = exports.farmStruct = exports.poolStateStruct = exports.partnerInfoStruct = exports.boostrappingStruct = exports.poolFeesStruct = exports.PoolType = exports.CurveType = exports.stableParamsStruct = exports.TokenMultiplierStruct = exports.depegStruct = exports.DepegType = exports.padding2Struct = exports.paddingStruct = exports.vaultStruct = exports.lockedProfitTrackerStruct = exports.vaultBumpsStruct = void 0;
4
4
  const beet_1 = require("@metaplex-foundation/beet");
5
5
  const beet_solana_1 = require("@metaplex-foundation/beet-solana");
6
6
  const solana_1 = require("../../utils/solana");
@@ -89,27 +89,7 @@ exports.partnerInfoStruct = new beet_1.BeetStruct([
89
89
  ['pendingFeeB', solana_1.u64],
90
90
  ], (args) => args);
91
91
  exports.poolStateStruct = new beet_1.FixableBeetStruct([
92
- ['buffer', (0, solana_1.blob)(8)],
93
- ['lpMint', beet_solana_1.publicKey],
94
- ['tokenAMint', beet_solana_1.publicKey],
95
- ['tokenBMint', beet_solana_1.publicKey],
96
- ['aVault', beet_solana_1.publicKey],
97
- ['bVault', beet_solana_1.publicKey],
98
- ['aVaultLp', beet_solana_1.publicKey],
99
- ['bVaultLp', beet_solana_1.publicKey],
100
- ['aVaultLpBump', beet_1.u8],
101
- ['enabled', beet_1.bool],
102
- ['adminTokenAFee', beet_solana_1.publicKey],
103
- ['adminTokenBFee', beet_solana_1.publicKey],
104
- ['admin', beet_solana_1.publicKey],
105
- ['fees', exports.poolFeesStruct],
106
- ['poolType', beet_1.u8],
107
- ['stake', beet_solana_1.publicKey],
108
- ['padding', exports.paddingStruct],
109
- ['curveType', beet_1.u8],
110
- ], (args) => args);
111
- exports.poolStateV2Struct = new beet_1.FixableBeetStruct([
112
- ['buffer', (0, solana_1.blob)(8)],
92
+ ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
113
93
  ['lpMint', beet_solana_1.publicKey],
114
94
  ['tokenAMint', beet_solana_1.publicKey],
115
95
  ['tokenBMint', beet_solana_1.publicKey],
@@ -119,18 +99,18 @@ exports.poolStateV2Struct = new beet_1.FixableBeetStruct([
119
99
  ['bVaultLp', beet_solana_1.publicKey],
120
100
  ['aVaultLpBump', beet_1.u8],
121
101
  ['enabled', beet_1.bool],
122
- ['adminTokenAFee', beet_solana_1.publicKey],
123
- ['adminTokenBFee', beet_solana_1.publicKey],
124
- ['feeLastUpdatedAt', solana_1.u64],
125
- ['padding0', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 24)],
126
- ['fees', exports.poolFeesStruct],
127
- ['poolType', beet_1.u8],
128
- ['stake', beet_solana_1.publicKey],
129
- ['totalLockedLp', solana_1.u64],
130
- ['bootstrapping', exports.boostrappingStruct],
131
- ['partnerInfo', exports.partnerInfoStruct],
132
- ['padding2', exports.padding2Struct],
133
- ['curveType', beet_1.u8],
102
+ /* ['adminTokenAFee', publicKey],
103
+ ['adminTokenBFee', publicKey],
104
+ ['feeLastUpdatedAt', u64],
105
+ ['padding0', uniformFixedSizeArray(u8, 24)],
106
+ ['fees', poolFeesStruct],
107
+ ['poolType', u8],
108
+ ['stake', publicKey],
109
+ ['totalLockedLp', u64],
110
+ ['bootstrapping', boostrappingStruct],
111
+ ['partnerInfo', partnerInfoStruct],
112
+ ['padding2', padding2Struct],
113
+ ['curveType', u8], */
134
114
  ], (args) => args);
135
115
  exports.farmStruct = new beet_1.BeetStruct([
136
116
  ['buffer', (0, solana_1.blob)(8)],
@@ -1 +1 @@
1
- {"version":3,"file":"struct.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/struct.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"struct.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/struct.ts"],"names":[],"mappings":"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"}
@@ -16,10 +16,20 @@ const structs_1 = require("./structs");
16
16
  const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
17
17
  const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
18
18
  const connection = (0, clients_1.getClientSolana)();
19
- const boostAccounts = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.boostStruct, constants_1.orePid)
20
- .addDataSizeFilter(structs_1.boostStruct.byteSize)
21
- .addFilter('accountDiscriminator', [100, 0, 0, 0, 0, 0, 0, 0])
22
- .run();
19
+ const [configAccounts, boostAccounts] = yield Promise.all([
20
+ ParsedGpa_1.ParsedGpa.build(connection, structs_1.configStruct, constants_1.orePid)
21
+ .addFilter('accountDiscriminator', [101, 0, 0, 0, 0, 0, 0, 0])
22
+ .run(),
23
+ ParsedGpa_1.ParsedGpa.build(connection, structs_1.boostStruct, constants_1.orePid)
24
+ .addDataSizeFilter()
25
+ .addFilter('accountDiscriminator', [100, 0, 0, 0, 0, 0, 0, 0])
26
+ .run(),
27
+ ]);
28
+ const config = Object.assign(Object.assign({}, configAccounts[0]), { boosts: configAccounts[0].boosts.filter((b) => b.toString() !== '11111111111111111111111111111111') });
29
+ yield cache.setItem('config', config, {
30
+ prefix: constants_1.platformId,
31
+ networkId: portfolio_core_1.NetworkId.solana,
32
+ });
23
33
  yield cache.setItem('boosts', boostAccounts, {
24
34
  prefix: constants_1.platformId,
25
35
  networkId: portfolio_core_1.NetworkId.solana,
@@ -1 +1 @@
1
- {"version":3,"file":"boostJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/boostJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAiD;AACjD,iDAAsD;AACtD,uCAAwC;AACxC,kEAA+D;AAE/D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAW,EAAE,kBAAM,CAAC;SACzE,iBAAiB,CAAC,qBAAW,CAAC,QAAQ,CAAC;SACvC,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SAC7D,GAAG,EAAE,CAAC;IAET,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE;QAC3C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"boostJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/boostJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAiD;AACjD,iDAAsD;AACtD,uCAA8D;AAC9D,kEAA+D;AAE/D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxD,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,sBAAY,EAAE,kBAAM,CAAC;aAC9C,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC7D,GAAG,EAAE;QACR,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAW,EAAE,kBAAM,CAAC;aAC7C,iBAAiB,EAAE;aACnB,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC7D,GAAG,EAAE;KACT,CAAC,CAAC;IAEH,MAAM,MAAM,mCACP,cAAc,CAAC,CAAC,CAAC,KACpB,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,kCAAkC,CAC3D,GACF,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;QACpC,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE;QAC3C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
@@ -21,9 +21,16 @@ const boostMemo = new MemoizedCache_1.MemoizedCache('boosts', {
21
21
  prefix: constants_1.platformId,
22
22
  networkId: portfolio_core_1.NetworkId.solana,
23
23
  });
24
+ const configMemo = new MemoizedCache_1.MemoizedCache('config', {
25
+ prefix: constants_1.platformId,
26
+ networkId: portfolio_core_1.NetworkId.solana,
27
+ });
24
28
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
25
29
  const connection = (0, clients_1.getClientSolana)();
26
- const boostAccounts = yield boostMemo.getItem(cache);
30
+ const [boostAccounts, config] = yield Promise.all([
31
+ boostMemo.getItem(cache),
32
+ configMemo.getItem(cache),
33
+ ]);
27
34
  if (!boostAccounts)
28
35
  throw new Error('Boosts not found in cache');
29
36
  const stakeAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.stakeStruct, (0, helpers_1.getStakePdas)(owner, boostAccounts.map((b) => b.pubkey)));
@@ -1 +1 @@
1
- {"version":3,"file":"stakeFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/stakeFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAAkD;AAElD,iDAAsD;AACtD,+CAAmE;AACnE,gFAA6E;AAC7E,uCAAqD;AACrD,kEAA+D;AAC/D,uCAAyC;AAEzC,MAAM,SAAS,GAAG,IAAI,6BAAa,CAAgB,QAAQ,EAAE;IAC3D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrD,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEjE,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,UAAU,EACV,qBAAW,EACX,IAAA,sBAAY,EACV,KAAK,EACL,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CACnC,CACF,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAClD,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CACzC,CAAC;QACF,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;YAC/B,GAAG,EAAE,GAAG,CAAC,MAAM;YACf,IAAI,EAAE,4BAA4B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YAC5D,UAAU,EAAE;gBACV;oBACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACnC,IAAI,EAAE,MAAM;iBACb;aACF;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,QAAQ,CAAC;YACX,OAAO,EAAE,QAAQ,CAAC,IAAI;YACtB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;QAEH,GAAG,CAAC,cAAc,CAAC;YACjB,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,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":"stakeFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/stakeFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAAkD;AAElD,iDAAsD;AACtD,+CAAmE;AACnE,gFAA6E;AAC7E,uCAA6D;AAC7D,kEAA+D;AAC/D,uCAAyC;AAEzC,MAAM,SAAS,GAAG,IAAI,6BAAa,CAAgB,QAAQ,EAAE;IAC3D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AACH,MAAM,UAAU,GAAG,IAAI,6BAAa,CAAS,QAAQ,EAAE;IACrD,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC;QACxB,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC;KAC1B,CAAC,CAAC;IACH,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEjE,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,UAAU,EACV,qBAAW,EACX,IAAA,sBAAY,EACV,KAAK,EACL,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CACnC,CACF,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAClD,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CACzC,CAAC;QACF,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;YAC/B,GAAG,EAAE,GAAG,CAAC,MAAM;YACf,IAAI,EAAE,4BAA4B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YAC5D,UAAU,EAAE;gBACV;oBACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACnC,IAAI,EAAE,MAAM;iBACb;aACF;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,QAAQ,CAAC;YACX,OAAO,EAAE,QAAQ,CAAC,IAAI;YACtB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;QAEH,GAAG,CAAC,cAAc,CAAC;YACjB,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,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"}
@@ -16,11 +16,12 @@ exports.fetcher = exports.airdropFetcher = void 0;
16
16
  const portfolio_core_1 = require("@sonarwatch/portfolio-core");
17
17
  const axios_1 = __importDefault(require("axios"));
18
18
  const bignumber_js_1 = __importDefault(require("bignumber.js"));
19
- const tx_parser_1 = require("@sonarwatch/tx-parser");
20
19
  const web3_js_1 = require("@solana/web3.js");
21
20
  const AirdropFetcher_1 = require("../../AirdropFetcher");
22
21
  const constants_1 = require("./constants");
23
22
  const clients_1 = require("../../utils/clients");
23
+ const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
24
+ const solana_1 = require("../../utils/solana");
24
25
  const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
25
26
  const client = (0, clients_1.getClientSolana)();
26
27
  let res;
@@ -53,11 +54,25 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
53
54
  ],
54
55
  });
55
56
  const totalAmount = new bignumber_js_1.default(res.data.totalAmount);
56
- // This is for test purpose
57
- const claimAccount = new web3_js_1.PublicKey('35YYQV8wTUWxKoyMSAzhLSshxYSuiWZmtnsb94asAZfk');
58
- const claimSignatures = yield (0, tx_parser_1.getSignatures)(client, claimAccount.toString());
59
- const claimTransaction = yield (0, tx_parser_1.getTransactions)(client, claimSignatures.map((s) => s.signature));
60
- const claimTransactionParsed = claimTransaction.map((t) => (0, tx_parser_1.parseTransaction)(t, owner));
57
+ const claimAccounts = yield (0, solana_1.getProgramAccounts)(client, new web3_js_1.PublicKey('ARDPkhymCbfdan375FCgPnBJQvUfHeb7nHVdBfwWSxrp'), [
58
+ {
59
+ memcmp: {
60
+ offset: 0,
61
+ bytes: 'NiUarf1ngHA',
62
+ },
63
+ },
64
+ {
65
+ memcmp: {
66
+ offset: 9,
67
+ bytes: owner,
68
+ },
69
+ },
70
+ ]);
71
+ const claimAccount = claimAccounts[0];
72
+ let claims = [];
73
+ if (claimAccount) {
74
+ claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, claimAccount.pubkey, constants_1.layerMint);
75
+ }
61
76
  return (0, AirdropFetcher_1.getAirdropRaw)({
62
77
  statics: constants_1.airdropStatics,
63
78
  items: [
@@ -66,20 +81,8 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
66
81
  isClaimed: false,
67
82
  label: 'LAYER',
68
83
  address: constants_1.layerMint,
69
- claims: claimTransactionParsed.flatMap((t) => {
70
- var _a;
71
- if (t && t.blockTime) {
72
- const layerChange = (_a = t === null || t === void 0 ? void 0 : t.balanceChanges.find((b) => b.address === constants_1.layerMint)) === null || _a === void 0 ? void 0 : _a.change;
73
- if (layerChange)
74
- return {
75
- amount: layerChange,
76
- date: t.blockTime * 1000,
77
- txId: t.signature,
78
- };
79
- }
80
- return [];
81
- }),
82
- ref: '35YYQV8wTUWxKoyMSAzhLSshxYSuiWZmtnsb94asAZfk',
84
+ claims,
85
+ ref: claimAccount ? claimAccount.pubkey.toString() : undefined,
83
86
  },
84
87
  ],
85
88
  });
@@ -1 +1 @@
1
- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/airdropFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAA8D;AAC9D,kDAA6C;AAC7C,gEAAqC;AACrC,6CAA4C;AAC5C,yDAK8B;AAC9B,2CAMqB;AAErB,iDAAsD;AACtD,0FAAuF;AACvF,+CAAwD;AAExD,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,IAAI,GAAmC,CAAC;IACxC,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,sBAAU,GAAG,KAAK,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,GAAG;QAC3C,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAExD,MAAM,aAAa,GAAG,MAAM,IAAA,2BAAkB,EAC5C,MAAM,EACN,IAAI,mBAAS,CAAC,8CAA8C,CAAC,EAC7D;QACE;YACE,MAAM,EAAE;gBACN,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,aAAa;aACrB;SACF;QACD;YACE,MAAM,EAAE;gBACN,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,KAAK;aACb;SACF;KACF,CACF,CAAC;IACF,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IAEtC,IAAI,MAAM,GAAY,EAAE,CAAC;IACzB,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,qBAAS,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE;gBAC7D,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,MAAM;gBACN,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;aAC/D;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AACW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,iBAAiB,EACjB,0BAAc,CAAC,QAAQ,CACxB,CAAC"}
@@ -8,18 +8,24 @@ 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
- };
14
11
  Object.defineProperty(exports, "__esModule", { value: true });
15
12
  exports.fetcher = exports.airdropFetcher = void 0;
16
13
  const portfolio_core_1 = require("@sonarwatch/portfolio-core");
17
- const axios_1 = __importDefault(require("axios"));
14
+ const web3_js_1 = require("@solana/web3.js");
18
15
  const AirdropFetcher_1 = require("../../AirdropFetcher");
19
16
  const constants_1 = require("./constants");
17
+ const clients_1 = require("../../utils/clients");
18
+ const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
19
+ const structs_1 = require("./structs");
20
+ const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
20
21
  const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
21
- const res = yield axios_1.default.get(constants_1.airdropApi + owner);
22
- if (!res.data.length)
22
+ const client = (0, clients_1.getClientSolana)();
23
+ const account = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.airdropProofStruct, new web3_js_1.PublicKey('magnaSHyv8zzKJJmr8NSz5JXmtdGDTTFPEADmvNAwbj'))
24
+ .addDataSizeFilter(127)
25
+ .addFilter('discriminator', [7, 25, 94, 15, 208, 170, 4, 103])
26
+ .addFilter('user', new web3_js_1.PublicKey(owner))
27
+ .run();
28
+ if (!account.length)
23
29
  return (0, AirdropFetcher_1.getAirdropRaw)({
24
30
  statics: constants_1.airdropStatics,
25
31
  items: [
@@ -31,20 +37,16 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
31
37
  },
32
38
  ],
33
39
  });
34
- let amount = 0;
35
- let claimedAmount = 0;
36
- for (const airdrop of res.data) {
37
- amount += airdrop.total;
38
- claimedAmount += airdrop.claimed;
39
- }
40
+ const claims = (yield Promise.all(account.map((acc) => (0, getClaimTransactions_1.getClaimTransactions)(owner, acc.pubkey.toString(), constants_1.sonicMint)))).flat();
40
41
  return (0, AirdropFetcher_1.getAirdropRaw)({
41
42
  statics: constants_1.airdropStatics,
42
43
  items: [
43
44
  {
44
- amount,
45
- isClaimed: claimedAmount === amount,
45
+ amount: claims.reduce((acc, claim) => acc + claim.amount, 0),
46
+ isClaimed: true,
46
47
  label: 'SONIC',
47
48
  address: constants_1.sonicMint,
49
+ claims,
48
50
  },
49
51
  ],
50
52
  });
@@ -1 +1 @@
1
- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,yDAK8B;AAC9B,2CAAgF;AAGhF,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,GAAG,GAAqC,MAAM,eAAK,CAAC,GAAG,CAC3D,sBAAU,GAAG,KAAK,CACnB,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM;QAClB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;QACxB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM;gBACN,SAAS,EAAE,aAAa,KAAK,MAAM;gBACnC,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;aACnB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AACW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,eAAe,EACf,0BAAc,CAAC,QAAQ,CACxB,CAAC"}
1
+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAC5C,yDAK8B;AAC9B,2CAAoE;AACpE,iDAAsD;AACtD,kEAA+D;AAC/D,uCAA+C;AAC/C,0FAAuF;AAEvF,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,OAAO,GAAG,MAAM,qBAAS,CAAC,KAAK,CACnC,MAAM,EACN,4BAAkB,EAClB,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAC7D;SACE,iBAAiB,CAAC,GAAG,CAAC;SACtB,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SAC7D,SAAS,CAAC,MAAM,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SACvC,GAAG,EAAE,CAAC;IAET,IAAI,CAAC,OAAO,CAAC,MAAM;QACjB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,CACb,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClB,IAAA,2CAAoB,EAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,qBAAS,CAAC,CAC9D,CACF,CACF,CAAC,IAAI,EAAE,CAAC;IAET,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC5D,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,MAAM;aACP;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AACW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,eAAe,EACf,0BAAc,CAAC,QAAQ,CACxB,CAAC"}
@@ -24,3 +24,10 @@ export type UserStakeIndex = {
24
24
  index: number;
25
25
  };
26
26
  export declare const userStakeIndexStruct: FixableBeetStruct<UserStakeIndex, Partial<UserStakeIndex>>;
27
+ export type AirdropProof = {
28
+ discriminator: number[];
29
+ offset: Buffer;
30
+ user: PublicKey;
31
+ padding: Buffer;
32
+ };
33
+ export declare const airdropProofStruct: FixableBeetStruct<AirdropProof, Partial<AirdropProof>>;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.userStakeIndexStruct = exports.StakeTypeEnum = void 0;
3
+ exports.airdropProofStruct = exports.userStakeIndexStruct = exports.StakeTypeEnum = void 0;
4
4
  const beet_1 = require("@metaplex-foundation/beet");
5
5
  const beet_solana_1 = require("@metaplex-foundation/beet-solana");
6
6
  const solana_1 = require("../../utils/solana");
@@ -24,4 +24,10 @@ exports.userStakeIndexStruct = new beet_1.FixableBeetStruct([
24
24
  ['user', beet_solana_1.publicKey],
25
25
  ['index', beet_1.u32],
26
26
  ], (args) => args);
27
+ exports.airdropProofStruct = new beet_1.FixableBeetStruct([
28
+ ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
29
+ ['offset', (0, solana_1.blob)(77)],
30
+ ['user', beet_solana_1.publicKey],
31
+ ['padding', (0, solana_1.blob)(10)],
32
+ ], (args) => args);
27
33
  //# sourceMappingURL=structs.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/structs.ts"],"names":[],"mappings":";;;AAAA,oDAMmC;AACnC,kEAA6D;AAG7D,+CAAoD;AAEpD,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,uDAAO,CAAA;IACP,qDAAM,CAAA;AACR,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAkBY,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,WAAI,CAAC;IAChB,CAAC,YAAY,EAAE,WAAI,CAAC;IACpB,CAAC,MAAM,EAAE,UAAG,CAAC;IACb,CAAC,WAAW,EAAE,SAAE,CAAC;IACjB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,UAAG,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC"}
1
+ {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/structs.ts"],"names":[],"mappings":";;;AAAA,oDAOmC;AACnC,kEAA6D;AAG7D,+CAAoD;AAEpD,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,uDAAO,CAAA;IACP,qDAAM,CAAA;AACR,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAkBY,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,WAAI,CAAC;IAChB,CAAC,YAAY,EAAE,WAAI,CAAC;IACpB,CAAC,MAAM,EAAE,UAAG,CAAC;IACb,CAAC,WAAW,EAAE,SAAE,CAAC;IACjB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,UAAG,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AASW,QAAA,kBAAkB,GAAG,IAAI,wBAAiB,CACrD;IACE,CAAC,eAAe,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,EAAE,CAAC,CAAC;IACpB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,SAAS,EAAE,IAAA,aAAI,EAAC,EAAE,CAAC,CAAC;CACtB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC"}
@@ -10,4 +10,5 @@ export declare const pid: PublicKey;
10
10
  export declare const merklePid: PublicKey;
11
11
  export declare const stakePid: PublicKey;
12
12
  export declare const airdropApi = "https://api.streamflow.foundation/v2/api/airdrop-recipients/check-eligibility";
13
+ export declare const streamflowApi = "https://api-public.streamflow.finance/v2/api/";
13
14
  export declare const airdropStatics: AirdropStatics;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.airdropStatics = exports.airdropApi = exports.stakePid = exports.merklePid = exports.pid = exports.streamflowProgramId = exports.platformImg = exports.platformId = exports.streamMint = void 0;
3
+ exports.airdropStatics = exports.streamflowApi = exports.airdropApi = exports.stakePid = exports.merklePid = exports.pid = exports.streamflowProgramId = exports.platformImg = exports.platformId = exports.streamMint = void 0;
4
4
  const web3_js_1 = require("@solana/web3.js");
5
5
  exports.streamMint = 'STREAMribRwybYpMmSYoCsQUdr6MZNXEqHgm7p1gu9M';
6
6
  exports.platformId = 'streamflow';
@@ -10,6 +10,7 @@ exports.pid = new web3_js_1.PublicKey('aSTRM2NKoKxNnkmLWk9sz3k74gKBk9t7bpPrTGxMs
10
10
  exports.merklePid = new web3_js_1.PublicKey('MErKy6nZVoVAkryxAejJz2juifQ4ArgLgHmaJCQkU7N');
11
11
  exports.stakePid = new web3_js_1.PublicKey('STAKEvGqQTtzJZH6BWDcbpzXXn2BBerPAgQ3EGLN2GH');
12
12
  exports.airdropApi = 'https://api.streamflow.foundation/v2/api/airdrop-recipients/check-eligibility';
13
+ exports.streamflowApi = 'https://api-public.streamflow.finance/v2/api/';
13
14
  exports.airdropStatics = {
14
15
  claimLink: 'https://streamflow.foundation/',
15
16
  emitterLink: 'https://streamflow.foundation/',
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,6CAA6C,CAAC;AAC3D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,WAAW,GACtB,gFAAgF,CAAC;AACtE,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,6CAA6C,CAC9C,CAAC;AACW,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnE,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC;AACW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,+EAA+E,CAAC;AAErE,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,gCAAgC;IAC3C,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE,YAAY;IACzB,EAAE,EAAE,oBAAoB;IACxB,KAAK,EACH,gFAAgF;IAClF,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAE,aAAa;CAC1B,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,6CAA6C,CAAC;AAC3D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,WAAW,GACtB,gFAAgF,CAAC;AACtE,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,6CAA6C,CAC9C,CAAC;AACW,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnE,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC;AACW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,+EAA+E,CAAC;AAErE,QAAA,aAAa,GAAG,+CAA+C,CAAC;AAEhE,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,gCAAgC;IAC3C,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE,YAAY;IACzB,EAAE,EAAE,oBAAoB;IACxB,KAAK,EACH,gFAAgF;IAClF,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAE,aAAa;CAC1B,CAAC"}
@@ -22,8 +22,8 @@ const airdropAddresses_1 = require("./airdropAddresses");
22
22
  function getPda(owner, distributor) {
23
23
  return web3_js_1.PublicKey.findProgramAddressSync([
24
24
  Buffer.from([67, 108, 97, 105, 109, 83, 116, 97, 116, 117, 115]),
25
- Buffer.from(owner),
26
- Buffer.from(distributor),
25
+ new web3_js_1.PublicKey(owner).toBuffer(),
26
+ new web3_js_1.PublicKey(distributor).toBuffer(),
27
27
  ], constants_1.merklePid)[0];
28
28
  }
29
29
  exports.getPda = getPda;
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/helpers.ts"],"names":[],"mappings":"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"}
@@ -8,12 +8,14 @@ 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"));
17
+ const bignumber_js_1 = __importDefault(require("bignumber.js"));
13
18
  const constants_1 = require("./constants");
14
- const clients_1 = require("../../utils/clients");
15
- const solana_1 = require("../../utils/solana");
16
- const structs_1 = require("./structs");
17
19
  const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
18
20
  const helpers_1 = require("./helpers");
19
21
  const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
@@ -22,36 +24,35 @@ const merkleMemo = new MemoizedCache_1.MemoizedCache('merkles', {
22
24
  networkId: portfolio_core_1.NetworkId.solana,
23
25
  });
24
26
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
25
- const client = (0, clients_1.getClientSolana)();
26
27
  const merkles = yield merkleMemo.getItem(cache);
27
28
  if (!merkles)
28
29
  throw new Error('No active merkles found in cache');
29
- const pdas = (0, helpers_1.getPdas)(owner, merkles.map((m) => m.address));
30
- // This will only return accounts that exist
31
- // meaning if the user didn't start to claim we won't but able to find his account
32
- const claimAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.claimStatusStruct, pdas);
30
+ const apiResponses = yield Promise.all(merkles.map((merkle) => axios_1.default
31
+ .get(`${constants_1.streamflowApi}/airdrops/${merkle.address}/claimants/${owner}`)
32
+ .then((response) => response.data)
33
+ .catch(() => undefined)));
33
34
  const registry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
34
- for (let i = 0; i < claimAccounts.length; i += 1) {
35
- const claim = claimAccounts[i];
36
- if (!claim)
35
+ for (let i = 0; i < apiResponses.length; i += 1) {
36
+ const allocationStatus = apiResponses[i];
37
+ if (!allocationStatus)
37
38
  continue;
38
39
  const merkle = merkles[i];
39
- if (claim.closed)
40
+ if (allocationStatus.chain !== 'SOLANA')
40
41
  continue;
41
42
  const element = registry.addElementMultiple({
42
43
  label: 'Airdrop',
43
44
  link: `https://app.streamflow.finance/airdrops/solana/mainnet/${merkle.address}`,
44
- ref: claim.pubkey.toString(),
45
+ ref: (0, helpers_1.getPda)(owner, allocationStatus.distributorAddress),
45
46
  sourceRefs: [{ address: merkle.address, name: 'Distributor' }],
46
47
  });
47
48
  element.addAsset({
48
49
  address: merkle.mint,
49
- amount: claim.unlockedAmount.minus(claim.lockedAmountWithdrawn),
50
+ amount: new bignumber_js_1.default(allocationStatus.amountUnlocked).minus(allocationStatus.amountClaimed),
50
51
  attributes: { isClaimable: true },
51
52
  });
52
53
  element.addAsset({
53
54
  address: merkle.mint,
54
- amount: claim.lockedAmount.minus(claim.lockedAmountWithdrawn),
55
+ amount: new bignumber_js_1.default(allocationStatus.amountLocked),
55
56
  attributes: { lockedUntil: -1 },
56
57
  });
57
58
  }
@@ -1 +1 @@
1
- {"version":3,"file":"merkleFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/merkleFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAyC;AACzC,iDAAsD;AACtD,+CAAmE;AACnE,uCAA8C;AAC9C,kEAA+D;AAC/D,uCAAoC;AAEpC,gFAA6E;AAE7E,MAAM,UAAU,GAAG,IAAI,6BAAa,CAAe,SAAS,EAAE;IAC5D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAElE,MAAM,IAAI,GAAG,IAAA,iBAAO,EAClB,KAAK,EACL,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAC9B,CAAC;IAEF,4CAA4C;IAC5C,kFAAkF;IAClF,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,MAAM,EACN,2BAAiB,EACjB,IAAI,CACL,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK;YAAE,SAAS;QAErB,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,KAAK,CAAC,MAAM;YAAE,SAAS;QAE3B,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,0DAA0D,MAAM,CAAC,OAAO,EAAE;YAChF,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC5B,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;SAC/D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC;YAC/D,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAClC,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC;YAC7D,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE;SAChC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,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":"merkleFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/merkleFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA0B;AAC1B,gEAAqC;AAGrC,2CAAwD;AACxD,kEAA+D;AAC/D,uCAAmC;AAEnC,gFAA6E;AAE7E,MAAM,UAAU,GAAG,IAAI,6BAAa,CAAe,SAAS,EAAE;IAC5D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACrB,eAAK;SACF,GAAG,CAAC,GAAG,yBAAa,aAAa,MAAM,CAAC,OAAO,cAAc,KAAK,EAAE,CAAC;SACrE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAwB,CAAC;SACrD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAC1B,CACF,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB;YAAE,SAAS;QAEhC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,gBAAgB,CAAC,KAAK,KAAK,QAAQ;YAAE,SAAS;QAElD,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,0DAA0D,MAAM,CAAC,OAAO,EAAE;YAChF,GAAG,EAAE,IAAA,gBAAM,EAAC,KAAK,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;YACvD,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;SAC/D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,sBAAS,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,KAAK,CAC1D,gBAAgB,CAAC,aAAa,CAC/B;YACD,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAClC,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,sBAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACpD,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE;SAChC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,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"}
@@ -11,6 +11,15 @@ export type Data = {
11
11
  cexWalletAddress: null;
12
12
  allocation: string;
13
13
  };
14
+ export type AirdropsResponse = {
15
+ chain: string;
16
+ distributorAddress: string;
17
+ address: string;
18
+ amountUnlocked: string;
19
+ amountLocked: string;
20
+ amountClaimed: string;
21
+ proof: number[];
22
+ };
14
23
  export type MerkleInfo = {
15
24
  address: string;
16
25
  mint: string;
@@ -22,7 +22,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
22
22
  if (!(0, helpers_1.ownerHasPowerUserAllocation)(owner))
23
23
  return [];
24
24
  const connection = (0, clients_1.getClientSolana)();
25
- const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magmaProgramId), (0, filters_1.vestingFilter)(owner), 1);
25
+ const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magnaProgramId), (0, filters_1.vestingFilter)(owner), 1);
26
26
  if (!accounts.length)
27
27
  return [];
28
28
  const tokenAccounts = yield connection.getParsedTokenAccountsByOwner(accounts[0].pubkey, { mint: new web3_js_1.PublicKey(constants_1.tnsrMint) });
@@ -5,6 +5,6 @@ import { AirdropStatics } from '../../AirdropFetcher';
5
5
  export declare const tnsrMint = "TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6";
6
6
  export declare const platformId = "tensor";
7
7
  export declare const tensorPid: PublicKey;
8
- export declare const magmaProgramId = "3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy";
8
+ export declare const magnaProgramId = "3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy";
9
9
  export declare const s4Statics: AirdropStatics;
10
10
  export declare const powerUsersStatics: AirdropStatics;
@@ -1,11 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.powerUsersStatics = exports.s4Statics = exports.magmaProgramId = exports.tensorPid = exports.platformId = exports.tnsrMint = void 0;
3
+ exports.powerUsersStatics = exports.s4Statics = exports.magnaProgramId = exports.tensorPid = exports.platformId = exports.tnsrMint = void 0;
4
4
  const web3_js_1 = require("@solana/web3.js");
5
5
  exports.tnsrMint = 'TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6';
6
6
  exports.platformId = 'tensor';
7
7
  exports.tensorPid = new web3_js_1.PublicKey('TSWAPaqyCSx2KABk68Shruf4rp7CxcNi8hAsbdwmHbN');
8
- exports.magmaProgramId = '3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy';
8
+ exports.magnaProgramId = '3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy';
9
9
  exports.s4Statics = {
10
10
  claimStart: 1738281600000,
11
11
  claimEnd: 1753963200000,
@@ -38,7 +38,7 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
38
38
  ],
39
39
  });
40
40
  const connection = (0, clients_1.getClientSolana)();
41
- const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magmaProgramId), (0, filters_1.vestingFilter)(owner), 1);
41
+ const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magnaProgramId), (0, filters_1.vestingFilter)(owner), 1);
42
42
  if (!accounts.length)
43
43
  return (0, AirdropFetcher_1.getAirdropRaw)({
44
44
  statics: constants_1.powerUsersStatics,