@sonarwatch/portfolio-plugins 0.8.58 → 0.8.60

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 (43) hide show
  1. package/CHANGELOG.md +9 -1
  2. package/package.json +2 -2
  3. package/src/plugins/aftermath/constants.js +1 -1
  4. package/src/plugins/aftermath/constants.js.map +1 -1
  5. package/src/plugins/hawksight/positionsFetcher.js +7 -3
  6. package/src/plugins/hawksight/positionsFetcher.js.map +1 -1
  7. package/src/plugins/maple/constants.js +1 -1
  8. package/src/plugins/maple/constants.js.map +1 -1
  9. package/src/plugins/marinade/constants.js +1 -1
  10. package/src/plugins/marinade/constants.js.map +1 -1
  11. package/src/plugins/orca/getWhirlpoolPositions.js +1 -1
  12. package/src/plugins/orca/getWhirlpoolPositions.js.map +1 -1
  13. package/src/plugins/orders/jupiter/limitFetcher.js +9 -12
  14. package/src/plugins/orders/jupiter/limitFetcher.js.map +1 -1
  15. package/src/plugins/raydium/clmmJob.d.ts +3 -0
  16. package/src/plugins/raydium/clmmJob.js +46 -0
  17. package/src/plugins/raydium/clmmJob.js.map +1 -0
  18. package/src/plugins/raydium/constants.d.ts +1 -0
  19. package/src/plugins/raydium/constants.js +2 -1
  20. package/src/plugins/raydium/constants.js.map +1 -1
  21. package/src/plugins/raydium/filters.d.ts +1 -0
  22. package/src/plugins/raydium/filters.js +4 -1
  23. package/src/plugins/raydium/filters.js.map +1 -1
  24. package/src/plugins/raydium/getRaydiumCLMMPositions.js +7 -7
  25. package/src/plugins/raydium/getRaydiumCLMMPositions.js.map +1 -1
  26. package/src/plugins/raydium/index.js +2 -1
  27. package/src/plugins/raydium/index.js.map +1 -1
  28. package/src/plugins/realms/constants.js +1 -1
  29. package/src/plugins/realms/constants.js.map +1 -1
  30. package/src/plugins/realms/depositsFetcher.js +4 -4
  31. package/src/plugins/realms/depositsFetcher.js.map +1 -1
  32. package/src/plugins/tokens/fetchers/solana.js +3 -1
  33. package/src/plugins/tokens/fetchers/solana.js.map +1 -1
  34. package/src/plugins/uniswap/constants.js +1 -1
  35. package/src/plugins/uniswap/constants.js.map +1 -1
  36. package/src/plugins/uniswap-v2/helpers.js +22 -22
  37. package/src/utils/clmm/tokenPricesFromSqrt.js.map +1 -1
  38. package/src/utils/solana/constants.d.ts +1 -0
  39. package/src/utils/solana/constants.js +2 -1
  40. package/src/utils/solana/constants.js.map +1 -1
  41. package/src/utils/solana/getTokenAccountsByOwner.d.ts +1 -1
  42. package/src/utils/solana/getTokenAccountsByOwner.js +7 -4
  43. package/src/utils/solana/getTokenAccountsByOwner.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -2,10 +2,18 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
- ## [0.8.58](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.57...plugins-0.8.58) (2023-11-07)
5
+ ## [0.8.60](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.59...plugins-0.8.60) (2023-11-07)
6
6
 
7
7
 
8
8
 
9
+ ## [0.8.59](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.58...plugins-0.8.59) (2023-11-07)
10
+
11
+
12
+
13
+ ## [0.8.58](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.57...plugins-0.8.58) (2023-11-07)
14
+
15
+
16
+
9
17
  ## [0.8.57](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.56...plugins-0.8.57) (2023-11-06)
10
18
 
11
19
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.8.58",
3
+ "version": "0.8.60",
4
4
  "type": "commonjs",
5
5
  "generators": "./generators.json",
6
6
  "dependencies": {
@@ -39,7 +39,7 @@
39
39
  "web3-v1": "npm:web3@^1.5.0"
40
40
  },
41
41
  "peerDependencies": {
42
- "@sonarwatch/portfolio-core": "0.8.58"
42
+ "@sonarwatch/portfolio-core": "0.8.60"
43
43
  },
44
44
  "main": "./src/index.js",
45
45
  "types": "./src/index.d.ts"
@@ -6,7 +6,7 @@ exports.aftermathPlatform = {
6
6
  id: exports.platformId,
7
7
  name: 'Aftermath',
8
8
  image: 'https://sonar.watch/img/platforms/aftermath.png',
9
- defiLlamaId: 'aftermath-finance',
9
+ defiLlamaId: 'parent#aftermath-finance',
10
10
  };
11
11
  exports.lpCoinsTable = '0x7f3bb65251feccacc7f48461239be1008233b85594114f7bf304e5e5b340bf59';
12
12
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aftermath/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,WAAW,CAAC;AAEzB,QAAA,iBAAiB,GAAa;IACzC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EAAE,iDAAiD;IACxD,WAAW,EAAE,mBAAmB;CACjC,CAAC;AAEW,QAAA,YAAY,GACvB,oEAAoE,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aftermath/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,WAAW,CAAC;AAEzB,QAAA,iBAAiB,GAAa;IACzC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EAAE,iDAAiD;IACxD,WAAW,EAAE,0BAA0B;CACxC,CAAC;AAEW,QAAA,YAAY,GACvB,oEAAoE,CAAC"}
@@ -25,21 +25,25 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
25
25
  const client = (0, clients_1.getClientSolana)();
26
26
  const derivedAddress = (0, helper_1.getHawksightUserPda)(new web3_js_1.PublicKey(owner));
27
27
  const tokenAccounts = yield (0, solana_2.getTokenAccountsByOwner)(client, derivedAddress);
28
+ if (tokenAccounts.length === 0)
29
+ return [];
28
30
  const accounts = [];
29
31
  for (const tokenAccount of tokenAccounts) {
30
32
  accounts.push(tokenAccount.mint.toString());
31
33
  }
32
34
  const nfts = [];
33
- const portfolioElements = yield Promise.all([
35
+ const portfolioElements = (yield Promise.all([
34
36
  // This handles Kamino, Saber, Marinade
35
37
  solana_1.default.executor(derivedAddress.toString(), cache),
36
38
  // This handles Orca
37
39
  (0, getWhirlpoolPositions_1.getWhirlpoolPositions)(cache, nfts, accounts),
38
40
  // This handles Solend
39
41
  obligationsFetcher_1.default.executor(derivedAddress.toString(), cache),
40
- ]);
42
+ ])).flat();
43
+ if (portfolioElements.length === 0)
44
+ return [];
41
45
  const elements = [];
42
- for (const element of portfolioElements.flat()) {
46
+ for (const element of portfolioElements) {
43
47
  const tmpElement = element;
44
48
  tmpElement.name = tmpElement.platformId;
45
49
  tmpElement.platformId = constants_1.platformId;
@@ -1 +1 @@
1
- {"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/hawksight/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAyE;AACzE,6CAA4C;AAI5C,2CAAyC;AACzC,qCAA+C;AAC/C,sFAA8D;AAC9D,uEAAqD;AACrD,iDAAsD;AACtD,yEAAsE;AACtE,+CAA6D;AAE7D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAuB,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC7C;IACD,MAAM,IAAI,GAA0B,EAAE,CAAC;IAEvC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1C,uCAAuC;QACvC,gBAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC;QACvD,oBAAoB;QACpB,IAAA,6CAAqB,EAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC;QAC5C,sBAAsB;QACtB,4BAAkB,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC;KAC9D,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,MAAM,OAAO,IAAI,iBAAiB,CAAC,IAAI,EAAE,EAAE;QAC9C,MAAM,UAAU,GAAG,OAAO,CAAC;QAC3B,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC;QACxC,UAAU,CAAC,UAAU,GAAG,sBAAU,CAAC;QACnC,QAAQ,CAAC,IAAI,mBACR,UAAU,EACb,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/hawksight/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAyE;AACzE,6CAA4C;AAI5C,2CAAyC;AACzC,qCAA+C;AAC/C,sFAA8D;AAC9D,uEAAqD;AACrD,iDAAsD;AACtD,yEAAsE;AACtE,+CAA6D;AAE7D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAuB,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5E,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE1C,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC7C;IACD,MAAM,IAAI,GAA0B,EAAE,CAAC;IAEvC,MAAM,iBAAiB,GAAG,CACxB,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,uCAAuC;QACvC,gBAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC;QACvD,oBAAoB;QACpB,IAAA,6CAAqB,EAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC;QAC5C,sBAAsB;QACtB,4BAAkB,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC;KAC9D,CAAC,CACH,CAAC,IAAI,EAAE,CAAC;IAET,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE9C,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;QACvC,MAAM,UAAU,GAAG,OAAO,CAAC;QAC3B,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC;QACxC,UAAU,CAAC,UAAU,GAAG,sBAAU,CAAC;QACnC,QAAQ,CAAC,IAAI,mBACR,UAAU,EACb,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
@@ -6,7 +6,7 @@ exports.maplePlatform = {
6
6
  id: exports.platformId,
7
7
  name: 'Maple',
8
8
  image: 'https://sonar.watch/img/platforms/maple.png',
9
- defiLlamaId: 'maple-finance',
9
+ defiLlamaId: 'parent#maple-finance',
10
10
  };
11
11
  exports.solanaLoanToken = 'AxuK8gNvN4Q8HtgHxFbePP6b84SpmcNTPdFA1E164Hgs';
12
12
  exports.poolsKey = 'poolsInfo';
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maple/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,OAAO,CAAC;AAErB,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,eAAe;CAC7B,CAAC;AAEW,QAAA,eAAe,GAAG,8CAA8C,CAAC;AACjE,QAAA,QAAQ,GAAG,WAAW,CAAC;AAEvB,QAAA,YAAY,GAAG;IAC1B,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;CAC7C,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/maple/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,OAAO,CAAC;AAErB,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,sBAAsB;CACpC,CAAC;AAEW,QAAA,eAAe,GAAG,8CAA8C,CAAC;AACjE,QAAA,QAAQ,GAAG,WAAW,CAAC;AAEvB,QAAA,YAAY,GAAG;IAC1B,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;CAC7C,CAAC"}
@@ -12,7 +12,7 @@ exports.marinadePlatform = {
12
12
  id: exports.platformId,
13
13
  name: 'Marinade',
14
14
  image: 'https://sonar.watch/img/platforms/marinade.png',
15
- defiLlamaId: 'marinade-finance',
15
+ defiLlamaId: 'parent#marinade-finance',
16
16
  };
17
17
  exports.cachePrefix = 'marinade';
18
18
  exports.marinadeTicketProgramId = new web3_js_1.PublicKey('MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD');
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marinade/constants.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,+DAAqE;AACrE,gEAAqC;AAExB,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,kBAAkB;CAChC,CAAC;AAEW,QAAA,WAAW,GAAG,UAAU,CAAC;AACzB,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAClD,6CAA6C,CAC9C,CAAC;AACW,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marinade/constants.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,+DAAqE;AACrE,gEAAqC;AAExB,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,yBAAyB;CACvC,CAAC;AAEW,QAAA,WAAW,GAAG,UAAU,CAAC;AACzB,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAClD,6CAA6C,CAC9C,CAAC;AACW,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC"}
@@ -125,7 +125,7 @@ function getWhirlpoolPositions(cache, nfts, additionalAccounts) {
125
125
  networkId: portfolio_core_1.NetworkId.solana,
126
126
  platformId: constants_1.platformId,
127
127
  label: 'LiquidityPool',
128
- tags: ['Concentrated'],
128
+ name: 'Concentrated',
129
129
  value: totalLiquidityValue,
130
130
  data: {
131
131
  liquidities: assets,
@@ -1 +1 @@
1
- {"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,6 @@ const clients_1 = require("../../../utils/clients");
18
18
  const struct_1 = require("./struct");
19
19
  const solana_1 = require("../../../utils/solana");
20
20
  const filters_1 = require("./filters");
21
- const runInBatch_1 = __importDefault(require("../../../utils/misc/runInBatch"));
22
21
  const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
23
22
  const constants_2 = require("./constants");
24
23
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
@@ -28,16 +27,14 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
28
27
  return [];
29
28
  const tokensMints = new Set();
30
29
  for (let i = 0; i < limitOrdersAccounts.length; i += 1) {
31
- tokensMints.add(limitOrdersAccounts[i].inputMint);
30
+ tokensMints.add(limitOrdersAccounts[i].inputMint.toString());
32
31
  }
33
- const tokenPriceResults = yield (0, runInBatch_1.default)([...Array.from(tokensMints)].map((mint) => () => cache.getTokenPrice(mint.toString(), portfolio_core_1.NetworkId.solana)));
34
- const tokenPrices = new Map();
35
- tokenPriceResults.forEach((r) => {
36
- if (r.status === 'rejected')
32
+ const tokenPriceResults = yield cache.getTokenPrices(Array.from(tokensMints), portfolio_core_1.NetworkId.solana);
33
+ const tokenPriceById = new Map();
34
+ tokenPriceResults.forEach((tP) => {
35
+ if (!tP)
37
36
  return;
38
- if (!r.value)
39
- return;
40
- tokenPrices.set(r.value.address, r.value);
37
+ tokenPriceById.set(tP.address, tP);
41
38
  });
42
39
  const rawAmountByMint = new Map();
43
40
  for (let i = 0; i < limitOrdersAccounts.length; i += 1) {
@@ -50,12 +47,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
50
47
  let value = 0;
51
48
  const assets = [];
52
49
  for (const [mint, rawAmount] of rawAmountByMint) {
53
- const tokenPrice = tokenPrices.get(mint);
50
+ if (rawAmount.isZero())
51
+ continue;
52
+ const tokenPrice = tokenPriceById.get(mint);
54
53
  if (!tokenPrice)
55
54
  continue;
56
55
  const amount = rawAmount.dividedBy(Math.pow(10, tokenPrice.decimals)).toNumber();
57
- if (amount === 0)
58
- continue;
59
56
  const asset = (0, tokenPriceToAssetToken_1.default)(mint, amount, portfolio_core_1.NetworkId.solana, tokenPrice);
60
57
  assets.push(asset);
61
58
  value += asset.value ? asset.value : 0;
@@ -1 +1 @@
1
- {"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/jupiter/limitFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/orders/jupiter/limitFetcher.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import { Job } from '../../Job';
2
+ declare const job: Job;
3
+ export default job;
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
16
+ const bignumber_js_1 = __importDefault(require("bignumber.js"));
17
+ const constants_1 = require("./constants");
18
+ const solana_1 = require("../../utils/solana");
19
+ const clients_1 = require("../../utils/clients");
20
+ const tokenPricesFromSqrt_1 = __importDefault(require("../../utils/clmm/tokenPricesFromSqrt"));
21
+ const clmms_1 = require("./structs/clmms");
22
+ const filters_1 = require("./filters");
23
+ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
24
+ const client = (0, clients_1.getClientSolana)();
25
+ const clmmPoolsInfo = yield (0, solana_1.getParsedProgramAccounts)(client, clmms_1.poolStateStruct, constants_1.raydiumProgram, filters_1.poolsStateFilter);
26
+ const promises = [];
27
+ for (let id = 0; id < clmmPoolsInfo.length; id++) {
28
+ const poolState = clmmPoolsInfo[id];
29
+ if (poolState.liquidity.isZero())
30
+ continue;
31
+ const reserve0 = yield client.getBalance(poolState.tokenVault0);
32
+ const reserve1 = yield client.getBalance(poolState.tokenVault1);
33
+ promises.push((0, tokenPricesFromSqrt_1.default)(cache, portfolio_core_1.NetworkId.solana, poolState.pubkey.toString(), new bignumber_js_1.default(reserve0), new bignumber_js_1.default(reserve1), poolState.sqrtPriceX64, poolState.tokenMint0.toString(), poolState.tokenMint1.toString()));
34
+ promises.push(cache.setItem(poolState.pubkey.toString(), poolState, {
35
+ prefix: constants_1.poolStatesPrefix,
36
+ networkId: portfolio_core_1.NetworkId.solana,
37
+ }));
38
+ }
39
+ yield Promise.all(promises);
40
+ });
41
+ const job = {
42
+ id: `${constants_1.platformId}-clmm`,
43
+ executor,
44
+ };
45
+ exports.default = job;
46
+ //# sourceMappingURL=clmmJob.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clmmJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,2CAA2E;AAC3E,+CAA8D;AAC9D,iDAAsD;AAGtD,+FAA4E;AAC5E,2CAAkD;AAClD,uCAA6C;AAE7C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,uBAAe,EACf,0BAAc,EACd,0BAAgB,CACjB,CAAC;IAEF,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,aAAa,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;QAChD,MAAM,SAAS,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE;YAAE,SAAS;QAE3C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAChE,QAAQ,CAAC,IAAI,CACX,IAAA,6BAAwB,EACtB,KAAK,EACL,0BAAS,CAAC,MAAM,EAChB,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC3B,IAAI,sBAAS,CAAC,QAAQ,CAAC,EACvB,IAAI,sBAAS,CAAC,QAAQ,CAAC,EACvB,SAAS,CAAC,YAAY,EACtB,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,EAC/B,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,CAChC,CACF,CAAC;QAEF,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE;YACpD,MAAM,EAAE,4BAAgB;YACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CACH,CAAC;KACH;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,QAAQ;CACT,CAAC;AACF,kBAAe,GAAG,CAAC"}
@@ -5,4 +5,5 @@ export declare const raydiumPlatform: Platform;
5
5
  export declare const AMM_PROGRAM_ID_V4: PublicKey;
6
6
  export declare const AMM_PROGRAM_ID_V5: PublicKey;
7
7
  export declare const raydiumProgram: PublicKey;
8
+ export declare const poolStatesPrefix: string;
8
9
  export declare const positionsIdentifier = "Raydium Concentrated Liquidity";
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.positionsIdentifier = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.raydiumPlatform = exports.platformId = void 0;
3
+ exports.positionsIdentifier = exports.poolStatesPrefix = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.raydiumPlatform = exports.platformId = void 0;
4
4
  const web3_js_1 = require("@solana/web3.js");
5
5
  exports.platformId = 'raydium';
6
6
  exports.raydiumPlatform = {
@@ -12,5 +12,6 @@ exports.raydiumPlatform = {
12
12
  exports.AMM_PROGRAM_ID_V4 = new web3_js_1.PublicKey('675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8');
13
13
  exports.AMM_PROGRAM_ID_V5 = new web3_js_1.PublicKey('5quBtoiQqxF9Jv6KYKctB59NT3gtJD2Y65kdnB1Uev3h');
14
14
  exports.raydiumProgram = new web3_js_1.PublicKey('CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK');
15
+ exports.poolStatesPrefix = `${exports.platformId}-poolSates`;
15
16
  exports.positionsIdentifier = 'Raydium Concentrated Liquidity';
16
17
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,eAAe,GAAa;IACvC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,SAAS;CACvB,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,gCAAgC,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,eAAe,GAAa;IACvC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,SAAS;CACvB,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,gBAAgB,GAAG,GAAG,kBAAU,YAAY,CAAC;AAE7C,QAAA,mBAAmB,GAAG,gCAAgC,CAAC"}
@@ -1,3 +1,4 @@
1
1
  import { GetProgramAccountsFilter } from '@solana/web3.js';
2
2
  export declare const ammV4Filter: GetProgramAccountsFilter[];
3
3
  export declare const ammV5Filter: GetProgramAccountsFilter[];
4
+ export declare const poolsStateFilter: GetProgramAccountsFilter[];
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ammV5Filter = exports.ammV4Filter = void 0;
3
+ exports.poolsStateFilter = exports.ammV5Filter = exports.ammV4Filter = void 0;
4
4
  const amms_1 = require("./structs/amms");
5
5
  exports.ammV4Filter = [
6
6
  { dataSize: amms_1.ammInfoV4Struct.byteSize },
@@ -8,4 +8,7 @@ exports.ammV4Filter = [
8
8
  exports.ammV5Filter = [
9
9
  { dataSize: amms_1.ammInfoV5Struct.byteSize },
10
10
  ];
11
+ exports.poolsStateFilter = [
12
+ { dataSize: 1544 },
13
+ ];
11
14
  //# sourceMappingURL=filters.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/filters.ts"],"names":[],"mappings":";;;AACA,yCAAkE;AAErD,QAAA,WAAW,GAA+B;IACrD,EAAE,QAAQ,EAAE,sBAAe,CAAC,QAAQ,EAAE;CACvC,CAAC;AAEW,QAAA,WAAW,GAA+B;IACrD,EAAE,QAAQ,EAAE,sBAAe,CAAC,QAAQ,EAAE;CACvC,CAAC"}
1
+ {"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/filters.ts"],"names":[],"mappings":";;;AACA,yCAAkE;AAErD,QAAA,WAAW,GAA+B;IACrD,EAAE,QAAQ,EAAE,sBAAe,CAAC,QAAQ,EAAE;CACvC,CAAC;AAEW,QAAA,WAAW,GAA+B;IACrD,EAAE,QAAQ,EAAE,sBAAe,CAAC,QAAQ,EAAE;CACvC,CAAC;AAEW,QAAA,gBAAgB,GAA+B;IAC1D,EAAE,QAAQ,EAAE,IAAI,EAAE;CACnB,CAAC"}
@@ -38,15 +38,15 @@ function getRaydiumCLMMPositions(cache, nfts) {
38
38
  const personalPositionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.personalPositionStateStruct, positionsProgramAddress);
39
39
  if (!personalPositionsInfo || personalPositionsInfo.length === 0)
40
40
  return [];
41
- const poolsStateInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, personalPositionsInfo.flatMap((position) => position ? position.poolId : []));
42
- if (!poolsStateInfo)
43
- return [];
44
- if (poolsStateInfo.length !== personalPositionsInfo.length)
45
- return [];
41
+ const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId.toString() : []);
42
+ const poolStatesInfo = yield cache.getItems(poolsIds, {
43
+ prefix: constants_1.poolStatesPrefix,
44
+ networkId: portfolio_core_1.NetworkId.solana,
45
+ });
46
46
  const assets = [];
47
47
  let totalLiquidityValue = 0;
48
48
  for (let index = 0; index < personalPositionsInfo.length; index++) {
49
- const poolStateInfo = poolsStateInfo[index];
49
+ const poolStateInfo = poolStatesInfo[index];
50
50
  if (!poolStateInfo)
51
51
  continue;
52
52
  const personalPositionInfo = personalPositionsInfo[index];
@@ -89,7 +89,7 @@ function getRaydiumCLMMPositions(cache, nfts) {
89
89
  networkId: portfolio_core_1.NetworkId.solana,
90
90
  platformId: constants_1.platformId,
91
91
  label: 'LiquidityPool',
92
- tags: ['Concentrated'],
92
+ name: 'Concentrated',
93
93
  value: totalLiquidityValue,
94
94
  data: {
95
95
  liquidities: assets,
@@ -1 +1 @@
1
- {"version":3,"file":"getRaydiumCLMMPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/getRaydiumCLMMPositions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getRaydiumCLMMPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/getRaydiumCLMMPositions.ts"],"names":[],"mappings":"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"}
@@ -5,8 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.fetchers = exports.jobs = exports.platforms = void 0;
7
7
  const lpTokensJob_1 = __importDefault(require("./lpTokensJob"));
8
+ const clmmJob_1 = __importDefault(require("./clmmJob"));
8
9
  const constants_1 = require("./constants");
9
10
  exports.platforms = [constants_1.raydiumPlatform];
10
- exports.jobs = [lpTokensJob_1.default];
11
+ exports.jobs = [lpTokensJob_1.default, clmmJob_1.default];
11
12
  exports.fetchers = [];
12
13
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/index.ts"],"names":[],"mappings":";;;;;;AAGA,gEAAwC;AACxC,2CAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,2BAAe,CAAC,CAAC;AAC1C,QAAA,IAAI,GAAU,CAAC,qBAAW,CAAC,CAAC;AAC5B,QAAA,QAAQ,GAAc,EAAE,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/index.ts"],"names":[],"mappings":";;;;;;AAGA,gEAAwC;AACxC,wDAAgC;AAChC,2CAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,2BAAe,CAAC,CAAC;AAC1C,QAAA,IAAI,GAAU,CAAC,qBAAW,EAAE,iBAAO,CAAC,CAAC;AACrC,QAAA,QAAQ,GAAc,EAAE,CAAC"}
@@ -6,7 +6,7 @@ exports.realmsPlatform = {
6
6
  id: exports.platformId,
7
7
  name: 'Realms',
8
8
  image: 'https://sonar.watch/img/platforms/realms.png',
9
- defiLlamaId: 'realms',
9
+ defiLlamaId: 'spl-governance',
10
10
  };
11
11
  exports.splGovProgramsKey = 'splGovernancePrograms';
12
12
  exports.splGovernanceUrl = 'https://app.realms.today/api/splGovernancePrograms';
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/realms/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,QAAQ,CAAC;AAEtB,QAAA,cAAc,GAAa;IACtC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,8CAA8C;IACrD,WAAW,EAAE,QAAQ;CACtB,CAAC;AAEW,QAAA,iBAAiB,GAAG,uBAAuB,CAAC;AAE5C,QAAA,gBAAgB,GAC3B,oDAAoD,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/realms/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,QAAQ,CAAC;AAEtB,QAAA,cAAc,GAAa;IACtC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,8CAA8C;IACrD,WAAW,EAAE,gBAAgB;CAC9B,CAAC;AAEW,QAAA,iBAAiB,GAAG,uBAAuB,CAAC;AAE5C,QAAA,gBAAgB,GAC3B,oDAAoD,CAAC"}
@@ -26,11 +26,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
26
26
  prefix: constants_1.platformId,
27
27
  networkId: portfolio_core_1.NetworkId.solana,
28
28
  });
29
+ if (!programs)
30
+ return [];
29
31
  const promises = [];
30
- if (programs) {
31
- for (const program of programs) {
32
- promises.push((0, solana_1.getParsedProgramAccounts)(client, structs_1.voteAccountStruct, new web3_js_1.PublicKey(program), (0, filters_1.voteAccountFilters)(owner)));
33
- }
32
+ for (const program of programs) {
33
+ promises.push((0, solana_1.getParsedProgramAccounts)(client, structs_1.voteAccountStruct, new web3_js_1.PublicKey(program), (0, filters_1.voteAccountFilters)(owner)));
34
34
  }
35
35
  const oldVoteAccounts = (yield Promise.all(promises)).flat();
36
36
  if (oldVoteAccounts.length === 0)
@@ -1 +1 @@
1
- {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/realms/depositsFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/realms/depositsFetcher.ts"],"names":[],"mappings":"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"}
@@ -23,7 +23,9 @@ const helpers_1 = require("../helpers");
23
23
  const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
24
24
  const client = (0, clients_1.getClientSolana)();
25
25
  const ownerPubKey = new web3_js_1.PublicKey(owner);
26
- const tokenAccounts = yield (0, solana_1.getTokenAccountsByOwner)(client, ownerPubKey);
26
+ const tokenRegularAccounts = yield (0, solana_1.getTokenAccountsByOwner)(client, ownerPubKey);
27
+ const token2022Accounts = yield (0, solana_1.getTokenAccountsByOwner)(client, ownerPubKey, solana_1.solanaToken2022Pid);
28
+ const tokenAccounts = [...token2022Accounts, ...tokenRegularAccounts];
27
29
  const mints = [...new Set(tokenAccounts.map((ta) => ta.mint.toString()))];
28
30
  const tokenPricesArray = yield cache.getTokenPrices(mints, portfolio_core_1.NetworkId.solana);
29
31
  const tokenPrices = new Map();
@@ -1 +1 @@
1
- {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ exports.uniswapPlatform = {
7
7
  id: exports.platformId,
8
8
  name: 'Uniswap',
9
9
  image: 'https://sonar.watch/img/platforms/uniswap.png',
10
- defiLlamaId: 'uniswap',
10
+ defiLlamaId: 'parent#uniswap',
11
11
  };
12
12
  exports.poolsPrefix = 'uniswap-v3';
13
13
  exports.poolsKey = 'poolsInfo';
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/uniswap/constants.ts"],"names":[],"mappings":";;;AAAA,+DAAiE;AAGpD,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,eAAe,GAAa;IACvC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,SAAS;CACvB,CAAC;AAEW,QAAA,WAAW,GAAG,YAAY,CAAC;AAC3B,QAAA,QAAQ,GAAG,WAAW,CAAC;AAEvB,QAAA,sBAAsB,GAAoB;IACrD;QACE,SAAS,EAAE,0BAAS,CAAC,QAAQ;QAC7B,OAAO,EAAE,4CAA4C;QACrD,eAAe,EAAE,4CAA4C;KAC9D;IACD;QACE,SAAS,EAAE,0BAAS,CAAC,OAAO;QAC5B,OAAO,EAAE,4CAA4C;QACrD,eAAe,EAAE,4CAA4C;KAC9D;IACD,IAAI;IACJ,mCAAmC;IACnC,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;IACL,IAAI;IACJ,+BAA+B;IAC/B,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;IACL,IAAI;IACJ,8BAA8B;IAC9B,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;IACL,IAAI;IACJ,mCAAmC;IACnC,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;CACN,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/uniswap/constants.ts"],"names":[],"mappings":";;;AAAA,+DAAiE;AAGpD,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,eAAe,GAAa;IACvC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,gBAAgB;CAC9B,CAAC;AAEW,QAAA,WAAW,GAAG,YAAY,CAAC;AAC3B,QAAA,QAAQ,GAAG,WAAW,CAAC;AAEvB,QAAA,sBAAsB,GAAoB;IACrD;QACE,SAAS,EAAE,0BAAS,CAAC,QAAQ;QAC7B,OAAO,EAAE,4CAA4C;QACrD,eAAe,EAAE,4CAA4C;KAC9D;IACD;QACE,SAAS,EAAE,0BAAS,CAAC,OAAO;QAC5B,OAAO,EAAE,4CAA4C;QACrD,eAAe,EAAE,4CAA4C;KAC9D;IACD,IAAI;IACJ,mCAAmC;IACnC,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;IACL,IAAI;IACJ,+BAA+B;IAC/B,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;IACL,IAAI;IACJ,8BAA8B;IAC9B,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;IACL,IAAI;IACJ,mCAAmC;IACnC,2DAA2D;IAC3D,mEAAmE;IACnE,KAAK;CACN,CAAC"}
@@ -36,28 +36,28 @@ exports.getPairsV2 = void 0;
36
36
  const graphql_request_1 = __importStar(require("graphql-request"));
37
37
  function getPairsV2(url) {
38
38
  return __awaiter(this, void 0, void 0, function* () {
39
- const query = (0, graphql_request_1.gql) `
40
- {
41
- pairs(
42
- orderBy: reserveUSD
43
- first: 500
44
- orderDirection: desc
45
- where: { trackedReserveETH_not: "0" }
46
- ) {
47
- id
48
- reserve0
49
- reserve1
50
- totalSupply
51
- token0 {
52
- id
53
- decimals
54
- }
55
- token1 {
56
- id
57
- decimals
58
- }
59
- }
60
- }
39
+ const query = (0, graphql_request_1.gql) `
40
+ {
41
+ pairs(
42
+ orderBy: reserveUSD
43
+ first: 500
44
+ orderDirection: desc
45
+ where: { trackedReserveETH_not: "0" }
46
+ ) {
47
+ id
48
+ reserve0
49
+ reserve1
50
+ totalSupply
51
+ token0 {
52
+ id
53
+ decimals
54
+ }
55
+ token1 {
56
+ id
57
+ decimals
58
+ }
59
+ }
60
+ }
61
61
  `;
62
62
  const res = yield (0, graphql_request_1.default)(url, query);
63
63
  const pairs = res.pairs;
@@ -1 +1 @@
1
- {"version":3,"file":"tokenPricesFromSqrt.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clmm/tokenPricesFromSqrt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokenPricesFromSqrt.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clmm/tokenPricesFromSqrt.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,3 @@
1
1
  import { PublicKey } from '@solana/web3.js';
2
2
  export declare const solanaTokenPid: PublicKey;
3
+ export declare const solanaToken2022Pid: PublicKey;
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.solanaTokenPid = void 0;
3
+ exports.solanaToken2022Pid = exports.solanaTokenPid = void 0;
4
4
  const web3_js_1 = require("@solana/web3.js");
5
5
  exports.solanaTokenPid = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
6
+ exports.solanaToken2022Pid = new web3_js_1.PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb');
6
7
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAC7C,6CAA6C,CAC9C,CAAC"}
@@ -1,2 +1,2 @@
1
1
  import { Connection, PublicKey } from '@solana/web3.js';
2
- export declare function getTokenAccountsByOwner(connection: Connection, owner: PublicKey): Promise<import("./types").ParsedAccount<import("./structs").TokenAccount>[]>;
2
+ export declare function getTokenAccountsByOwner(connection: Connection, owner: PublicKey, tokenProgramId?: PublicKey): Promise<import("./types").ParsedAccount<import("./structs").TokenAccount>[]>;
@@ -13,17 +13,20 @@ exports.getTokenAccountsByOwner = void 0;
13
13
  const getParsedProgramAccounts_1 = require("./getParsedProgramAccounts");
14
14
  const structs_1 = require("./structs");
15
15
  const constants_1 = require("./constants");
16
- function getTokenAccountsByOwner(connection, owner) {
16
+ function getTokenAccountsByOwner(connection, owner, tokenProgramId = constants_1.solanaTokenPid) {
17
17
  return __awaiter(this, void 0, void 0, function* () {
18
- return (0, getParsedProgramAccounts_1.getParsedProgramAccounts)(connection, structs_1.tokenAccountStruct, constants_1.solanaTokenPid, [
18
+ const filters = [
19
19
  {
20
20
  memcmp: {
21
21
  bytes: owner.toString(),
22
22
  offset: 32,
23
23
  },
24
24
  },
25
- { dataSize: structs_1.tokenAccountStruct.byteSize },
26
- ], 10000);
25
+ ];
26
+ if (tokenProgramId.toString() === constants_1.solanaTokenPid.toString()) {
27
+ filters.push({ dataSize: structs_1.tokenAccountStruct.byteSize });
28
+ }
29
+ return (0, getParsedProgramAccounts_1.getParsedProgramAccounts)(connection, structs_1.tokenAccountStruct, tokenProgramId, filters, 10000);
27
30
  });
28
31
  }
29
32
  exports.getTokenAccountsByOwner = getTokenAccountsByOwner;
@@ -1 +1 @@
1
- {"version":3,"file":"getTokenAccountsByOwner.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getTokenAccountsByOwner.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,yEAAsE;AACtE,uCAA+C;AAC/C,2CAA6C;AAE7C,SAAsB,uBAAuB,CAAC,UAAsB,EAAE,KAAgB;;QACpF,OAAO,IAAA,mDAAwB,EAC7B,UAAU,EACV,4BAAkB,EAClB,0BAAc,EACd;YACE;gBACE,MAAM,EAAE;oBACN,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE;oBACvB,MAAM,EAAE,EAAE;iBACX;aACF;YACD,EAAE,QAAQ,EAAE,4BAAkB,CAAC,QAAQ,EAAE;SAC1C,EACD,KAAK,CACN,CAAC;IACJ,CAAC;CAAA;AAhBD,0DAgBC"}
1
+ {"version":3,"file":"getTokenAccountsByOwner.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getTokenAccountsByOwner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,yEAAsE;AACtE,uCAA+C;AAC/C,2CAA6C;AAE7C,SAAsB,uBAAuB,CAC3C,UAAsB,EACtB,KAAgB,EAChB,iBAA4B,0BAAc;;QAE1C,MAAM,OAAO,GAA+B;YAC1C;gBACE,MAAM,EAAE;oBACN,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE;oBACvB,MAAM,EAAE,EAAE;iBACX;aACF;SACF,CAAC;QACF,IAAI,cAAc,CAAC,QAAQ,EAAE,KAAK,0BAAc,CAAC,QAAQ,EAAE,EAAE;YAC3D,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,4BAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;SACzD;QAED,OAAO,IAAA,mDAAwB,EAC7B,UAAU,EACV,4BAAkB,EAClB,cAAc,EACd,OAAO,EACP,KAAK,CACN,CAAC;IACJ,CAAC;CAAA;AAxBD,0DAwBC"}