@sonarwatch/portfolio-plugins 0.8.115 → 0.8.116

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,14 +2,18 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
- ## [0.8.115](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.114...plugins-0.8.115) (2023-11-30)
6
-
7
-
8
-
9
- ## [0.8.114](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.113...plugins-0.8.114) (2023-11-30)
5
+ ## [0.8.116](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.115...plugins-0.8.116) (2023-12-01)
10
6
 
11
7
 
12
8
 
9
+ ## [0.8.115](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.114...plugins-0.8.115) (2023-11-30)
10
+
11
+
12
+
13
+ ## [0.8.114](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.113...plugins-0.8.114) (2023-11-30)
14
+
15
+
16
+
13
17
  ## [0.8.113](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.112...plugins-0.8.113) (2023-11-29)
14
18
 
15
19
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sonarwatch/portfolio-plugins",
3
- "version": "0.8.115",
3
+ "version": "0.8.116",
4
4
  "type": "commonjs",
5
5
  "generators": "./generators.json",
6
6
  "dependencies": {
@@ -41,7 +41,7 @@
41
41
  "web3-v1": "npm:web3@^1.5.0"
42
42
  },
43
43
  "peerDependencies": {
44
- "@sonarwatch/portfolio-core": "0.8.115"
44
+ "@sonarwatch/portfolio-core": "0.8.116"
45
45
  },
46
46
  "main": "./src/index.js",
47
47
  "types": "./src/index.d.ts"
@@ -36,27 +36,27 @@ exports.getBalancerPoolsV2 = void 0;
36
36
  const graphql_request_1 = __importStar(require("graphql-request"));
37
37
  function getBalancerPoolsV2(url) {
38
38
  return __awaiter(this, void 0, void 0, function* () {
39
- const query = (0, graphql_request_1.gql) `
40
- query pools {
41
- pools(
42
- first: 1000
43
- orderBy: totalLiquidity
44
- orderDirection: desc
45
- where: { totalLiquidity_gt: "500" }
46
- ) {
47
- id
48
- address
49
- symbol
50
- totalLiquidity
51
- totalShares
52
- tokens {
53
- balance
54
- decimals
55
- symbol
56
- address
57
- }
58
- }
59
- }
39
+ const query = (0, graphql_request_1.gql) `
40
+ query pools {
41
+ pools(
42
+ first: 1000
43
+ orderBy: totalLiquidity
44
+ orderDirection: desc
45
+ where: { totalLiquidity_gt: "500" }
46
+ ) {
47
+ id
48
+ address
49
+ symbol
50
+ totalLiquidity
51
+ totalShares
52
+ tokens {
53
+ balance
54
+ decimals
55
+ symbol
56
+ address
57
+ }
58
+ }
59
+ }
60
60
  `;
61
61
  const res = yield (0, graphql_request_1.default)(url, query);
62
62
  const pools = res.pools;
@@ -23,24 +23,25 @@ const sevenDays = 7 * 1000 * 60 * 60 * 24;
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 accounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.userMetadataStruct, constants_1.stakerProgramId, (0, filters_1.stakingAccountFilter)(owner));
26
- if (accounts.length === 0)
26
+ if (accounts.length === 0 || accounts.length > 1)
27
27
  return [];
28
+ const stakingAccount = accounts[0];
28
29
  const gofxTokenPrice = yield cache.getTokenPrice(constants_1.gofxMint, portfolio_core_1.NetworkId.solana);
29
30
  if (!gofxTokenPrice)
30
31
  return [];
32
+ const { decimals } = gofxTokenPrice;
31
33
  const assets = [];
32
- for (const account of accounts) {
33
- let totalAmount = account.totalStaked;
34
- for (const ticket of account.unstakingTickets) {
35
- const unlockStartedAt = new Date(ticket.createdAt.times(1000).toNumber());
36
- const unlockingAt = new Date(unlockStartedAt.getTime() + sevenDays);
37
- if (Date.now() < unlockingAt.getTime())
38
- totalAmount = totalAmount.plus(ticket.totalUnstaked);
34
+ for (const ticket of stakingAccount.unstakingTickets) {
35
+ const unlockStartedAt = new Date(ticket.createdAt.times(1000).toNumber());
36
+ const unlockingAt = new Date(unlockStartedAt.getTime() + sevenDays);
37
+ if (Date.now() < unlockingAt.getTime()) {
38
+ assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(constants_1.gofxMint, ticket.totalUnstaked.dividedBy(Math.pow(10, decimals)).toNumber(), portfolio_core_1.NetworkId.solana, gofxTokenPrice)), { lockedUntil: unlockingAt.getTime() }));
39
39
  }
40
- if (totalAmount.isZero())
41
- continue;
42
- const { decimals } = gofxTokenPrice;
43
- const amount = totalAmount.dividedBy(Math.pow(10, decimals)).toNumber();
40
+ }
41
+ if (stakingAccount.totalStaked.isGreaterThan(0)) {
42
+ const amount = stakingAccount.totalStaked
43
+ .dividedBy(Math.pow(10, decimals))
44
+ .toNumber();
44
45
  assets.push((0, tokenPriceToAssetToken_1.default)(constants_1.gofxMint, amount, portfolio_core_1.NetworkId.solana, gofxTokenPrice));
45
46
  }
46
47
  if (assets.length === 0)
@@ -1 +1 @@
1
- {"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAGpC,2CAAoE;AACpE,iDAAsD;AACtD,+CAA8D;AAC9D,uCAA+C;AAC/C,uCAAiD;AACjD,qGAA6E;AAE7E,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE1C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,4BAAkB,EAClB,2BAAe,EACf,IAAA,8BAAoB,EAAC,KAAK,CAAC,CAC5B,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC7E,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC7C,MAAM,eAAe,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1E,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC;YACpE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE;gBACpC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;SACxD;QACD,IAAI,WAAW,CAAC,MAAM,EAAE;YAAE,SAAS;QAEnC,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEhE,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EAAC,oBAAQ,EAAE,MAAM,EAAE,0BAAS,CAAC,MAAM,EAAE,cAAc,CAAC,CAC3E,CAAC;KACH;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,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":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/goosefx/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AAGpC,2CAAoE;AACpE,iDAAsD;AACtD,+CAA8D;AAC9D,uCAA+C;AAC/C,uCAAiD;AACjD,qGAA6E;AAE7E,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE1C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,4BAAkB,EAClB,2BAAe,EACf,IAAA,8BAAoB,EAAC,KAAK,CAAC,CAC5B,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5D,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC7E,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,gBAAgB,EAAE;QACpD,MAAM,eAAe,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC;QACpE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE;YACtC,MAAM,CAAC,IAAI,iCACN,IAAA,gCAAsB,EACvB,oBAAQ,EACR,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,EACzD,0BAAS,CAAC,MAAM,EAChB,cAAc,CACf,KACD,WAAW,EAAE,WAAW,CAAC,OAAO,EAAE,IAClC,CAAC;SACJ;KACF;IACD,IAAI,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;QAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW;aACtC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;aACzB,QAAQ,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CACT,IAAA,gCAAsB,EAAC,oBAAQ,EAAE,MAAM,EAAE,0BAAS,CAAC,MAAM,EAAE,cAAc,CAAC,CAC3E,CAAC;KACH;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,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"}
@@ -25,24 +25,19 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
25
25
  if (accounts.length === 0 || accounts.length > 1)
26
26
  return [];
27
27
  const escrowAccount = accounts[0];
28
- // amount = amount.plus(account.amount.times(daysLocked).dividedBy(1460));
29
- const { amount } = escrowAccount;
28
+ const { amount, escrowEndsAt, duration } = escrowAccount;
30
29
  if (amount.isZero())
31
30
  return [];
32
- const daysLocked = escrowAccount.duration
33
- .dividedBy(60 * 60 * 24)
34
- .decimalPlaces(0);
35
- const yearsLocked = escrowAccount.duration
36
- .dividedBy(60 * 60 * 24 * 365)
37
- .decimalPlaces(0);
31
+ const lfntyTokenPrice = yield cache.getTokenPrice(constants_1.lfntyMint, portfolio_core_1.NetworkId.solana);
32
+ const yearsLocked = duration.dividedBy(60 * 60 * 24 * 365).decimalPlaces(0);
38
33
  const yearsText = yearsLocked.isEqualTo(1)
39
34
  ? `Locked (${yearsLocked} year)`
40
35
  : `Locked (${yearsLocked} years)`;
41
- const status = escrowAccount.escrow_ends_at.isZero()
42
- ? yearsText
43
- : `Unlocking (${daysLocked} days left)`;
44
- const lfntyTokenPrice = yield cache.getTokenPrice(constants_1.lfntyMint, portfolio_core_1.NetworkId.solana);
36
+ const name = escrowEndsAt.isZero() ? yearsText : undefined;
45
37
  const asset = (0, tokenPriceToAssetToken_1.default)(constants_1.lfntyMint, amount.dividedBy(Math.pow(10, constants_1.lfntyDecimals)).toNumber(), portfolio_core_1.NetworkId.solana, lfntyTokenPrice);
38
+ if (escrowEndsAt.isGreaterThan(0)) {
39
+ asset.lockedUntil = escrowEndsAt.toNumber();
40
+ }
46
41
  return [
47
42
  {
48
43
  label: 'Vesting',
@@ -51,7 +46,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
51
46
  networkId: portfolio_core_1.NetworkId.solana,
52
47
  platformId: constants_1.platformId,
53
48
  value: asset.value,
54
- name: status,
49
+ name,
55
50
  },
56
51
  ];
57
52
  });
@@ -1 +1 @@
1
- {"version":3,"file":"lockerFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/lifinity/lockerFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAG7E,2CAKqB;AACrB,iDAAsD;AACtD,+CAA8D;AAC9D,uCAAyC;AACzC,uCAAyC;AACzC,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,sBAAY,EACZ,mCAAuB,EACvB,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5D,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAElC,0EAA0E;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEjC,IAAI,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ;SACtC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;SACvB,aAAa,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,WAAW,GAAG,aAAa,CAAC,QAAQ;SACvC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;SAC7B,aAAa,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,WAAW,WAAW,QAAQ;QAChC,CAAC,CAAC,WAAW,WAAW,SAAS,CAAC;IAEpC,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,MAAM,EAAE;QAClD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,cAAc,UAAU,aAAa,CAAC;IAE1C,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,aAAa,CAC/C,qBAAS,EACT,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,qBAAS,EACT,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE,EAChD,0BAAS,CAAC,MAAM,EAChB,eAAe,CAChB,CAAC;IAEF,OAAO;QACL;YACE,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,qCAAoB,CAAC,MAAM;YACjC,IAAI,EAAE,EAAE,KAAK,EAAE;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE,MAAM;SACb;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"lockerFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/lifinity/lockerFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAG7E,2CAKqB;AACrB,iDAAsD;AACtD,+CAA8D;AAC9D,uCAAyC;AACzC,uCAAyC;AACzC,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,sBAAY,EACZ,mCAAuB,EACvB,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5D,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAElC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IAEzD,IAAI,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,aAAa,CAC/C,qBAAS,EACT,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,WAAW,WAAW,QAAQ;QAChC,CAAC,CAAC,WAAW,WAAW,SAAS,CAAC;IACpC,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAE3D,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,qBAAS,EACT,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE,EAChD,0BAAS,CAAC,MAAM,EAChB,eAAe,CAChB,CAAC;IAEF,IAAI,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;QACjC,KAAK,CAAC,WAAW,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;KAC7C;IAED,OAAO;QACL;YACE,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,qCAAoB,CAAC,MAAM;YACjC,IAAI,EAAE,EAAE,KAAK,EAAE;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI;SACL;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
@@ -19,11 +19,11 @@ export type Escrow = {
19
19
  owner: PublicKey;
20
20
  bump: number;
21
21
  amount: BigNumber;
22
- escrow_started_at: BigNumber;
23
- escrow_ends_at: BigNumber;
24
- initial_amount: BigNumber;
22
+ escrowStartedAt: BigNumber;
23
+ escrowEndsAt: BigNumber;
24
+ initialAmount: BigNumber;
25
25
  duration: BigNumber;
26
- vote_delegate: PublicKey;
26
+ voteDelegate: PublicKey;
27
27
  reserved1: number[];
28
28
  reserved2: number[];
29
29
  };
@@ -20,11 +20,11 @@ exports.escrowStruct = new beet_1.BeetStruct([
20
20
  ['owner', beet_solana_1.publicKey],
21
21
  ['bump', beet_1.u8],
22
22
  ['amount', solana_1.u64],
23
- ['escrow_started_at', solana_1.i64],
24
- ['escrow_ends_at', solana_1.i64],
25
- ['initial_amount', solana_1.i64],
23
+ ['escrowStartedAt', solana_1.i64],
24
+ ['escrowEndsAt', solana_1.i64],
25
+ ['initialAmount', solana_1.i64],
26
26
  ['duration', solana_1.i64],
27
- ['vote_delegate', beet_solana_1.publicKey],
27
+ ['voteDelegate', beet_solana_1.publicKey],
28
28
  ['reserved1', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 15)],
29
29
  ['reserved2', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)],
30
30
  ], (args) => args);
@@ -1 +1 @@
1
- {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/lifinity/structs.ts"],"names":[],"mappings":";;;AAAA,oDAImC;AACnC,kEAA6D;AAG7D,+CAAoD;AAavC,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,aAAa,EAAE,uBAAS,CAAC;IAC1B,CAAC,iBAAiB,EAAE,uBAAS,CAAC;IAC9B,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,cAAc,EAAE,uBAAS,CAAC;CAC5B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC;AAiBW,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,mBAAmB,EAAE,YAAG,CAAC;IAC1B,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,WAAW,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC,WAAW,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;CAC7C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC"}
1
+ {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/lifinity/structs.ts"],"names":[],"mappings":";;;AAAA,oDAImC;AACnC,kEAA6D;AAG7D,+CAAoD;AAavC,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,aAAa,EAAE,uBAAS,CAAC;IAC1B,CAAC,iBAAiB,EAAE,uBAAS,CAAC;IAC9B,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,cAAc,EAAE,uBAAS,CAAC;CAC5B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC;AAiBW,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,WAAW,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC,WAAW,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;CAC7C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC"}
@@ -52,15 +52,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
52
52
  ]);
53
53
  const lockedBalances = lockedBalancesRes.map((res) => res.status === 'failure' ? BigInt(0) : res.result);
54
54
  const unlockingBalances = [];
55
+ const unlockingTs = [];
55
56
  const statuses = [];
56
57
  for (let n = 0; n < unlockingBalancesRes.length; n++) {
57
58
  const res = unlockingBalancesRes[n];
58
59
  if (res.status === 'success') {
59
60
  unlockingBalances.push(res.result[0]);
61
+ unlockingTs.push(res.result[1]);
60
62
  statuses.push(res.result[2]);
61
63
  }
62
64
  else {
63
- unlockingBalances.push(BigInt(0));
64
65
  statuses.push(undefined);
65
66
  }
66
67
  }
@@ -72,15 +73,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
72
73
  return [];
73
74
  const unlockingAssets = [];
74
75
  for (let j = 0; j < unlockingBalances.length; j++) {
75
- const unlockingAmount = new bignumber_js_1.default(unlockingBalances[j].toString()).dividedBy(Math.pow(10, pspTokenPrice.decimals));
76
76
  const status = statuses[j];
77
77
  if (status &&
78
78
  status === types_1.WithdrawStatus.UNLOCKING &&
79
- unlockingAmount.isGreaterThan(0)) {
80
- // TODO : Unlocking date can be found here, not supported by our Data Structure for now.
81
- // const unlockEpoch = Number(unlockingAmountRes.result?.[1]);
82
- // const dateToDisplay = new Date(unlockEpoch * 1000).toLocaleDateString();
83
- unlockingAssets.push((0, tokenPriceToAssetToken_1.default)(pspTokenPrice.address, unlockingAmount.toNumber(), portfolio_core_1.NetworkId.ethereum, pspTokenPrice));
79
+ unlockingBalances[j] > BigInt(0)) {
80
+ const unlockingAmount = new bignumber_js_1.default(unlockingBalances[j].toString()).dividedBy(Math.pow(10, pspTokenPrice.decimals));
81
+ const unlockEpoch = Number(unlockingTs[j]);
82
+ unlockingAssets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(pspTokenPrice.address, unlockingAmount.toNumber(), portfolio_core_1.NetworkId.ethereum, pspTokenPrice)), { lockedUntil: unlockEpoch }));
84
83
  }
85
84
  }
86
85
  const lockedAssets = [];
@@ -1 +1 @@
1
- {"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/paraswap/stakingFetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/paraswap/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAMoC;AACpC,gEAAqC;AAGrC,2CAA4D;AAC5D,iDAAmD;AACnD,uDAA6D;AAC7D,qGAA6E;AAC7E,iCAA+D;AAC/D,mCAAyC;AAEzC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,0BAAS,CAAC,QAAQ,CAAC,CAAC;IAEhD,MAAM,kBAAkB,GAAG;QACzB,GAAG,EAAE,4BAAiB;QACtB,YAAY,EAAE,WAAW;QACzB,IAAI,EAAE,CAAC,KAAsB,CAAC;KACtB,CAAC;IAEX,MAAM,qBAAqB,GAAG;QAC5B,GAAG,EAAE,2BAAoB;QACzB,YAAY,EAAE,mBAAmB;KACzB,CAAC;IAEX,MAAM,eAAe,GAAG,EAAE,CAAC;IAC3B,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,KAAK,MAAM,MAAM,IAAI,mBAAO,EAAE;QAC5B,MAAM,qBAAqB,GAAG;YAC5B,OAAO,EAAE,MAAM,CAAC,OAAwB;YACxC,GAAG,EAAE,sBAAe;YACpB,YAAY,EAAE,sBAAe,CAAC,CAAC,CAAC,CAAC,IAAI;YACrC,IAAI,EAAE,CAAC,KAAsB,CAAC;SACtB,CAAC;QAEX,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAC;QACxE,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE;YAC/C,kBAAkB,CAAC,IAAI,CAAC,8BACtB,OAAO,EAAE,MAAM,CAAC,OAAwB,IACrC,qBAAqB,KACxB,IAAI,EAAE,CAAC,KAAsB,EAAE,CAAC,CAAC,GACzB,CAAC,CAAC;SACb;QACD,eAAe,CAAC,IAAI,CAAC,gCAChB,kBAAkB,KACrB,OAAO,EAAE,MAAM,CAAC,OAAwB,GAChC,CAAC,CAAC;KACb;IAED,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClE,MAAM,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;QAChD,MAAM,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;KACpD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnD,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAClD,CAAC;IACF,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpD,MAAM,GAAG,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YAC5B,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC1B;KACF;IAED,IACE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;QAEvD,OAAO,EAAE,CAAC;IAEZ,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAC7C,oBAAQ,CAAC,OAAO,EAChB,0BAAS,CAAC,QAAQ,CACnB,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,eAAe,GAA0B,EAAE,CAAC;IAElD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3B,IACE,MAAM;YACN,MAAM,KAAK,sBAAc,CAAC,SAAS;YACnC,iBAAiB,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAChC;YACA,MAAM,eAAe,GAAG,IAAI,sBAAS,CACnC,iBAAiB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAChC,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,aAAa,CAAC,QAAQ,CAAA,CAAC,CAAC;YAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAE3C,eAAe,CAAC,IAAI,iCACf,IAAA,gCAAsB,EACvB,aAAa,CAAC,OAAO,EACrB,eAAe,CAAC,QAAQ,EAAE,EAC1B,0BAAS,CAAC,QAAQ,EAClB,aAAa,CACd,KACD,WAAW,EAAE,WAAW,IACxB,CAAC;SACJ;KACF;IAED,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC9C,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CACxE,SAAA,EAAE,EAAI,aAAa,CAAC,QAAQ,CAAA,CAC7B,CAAC;QAEF,IAAI,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;YACjC,YAAY,CAAC,IAAI,CACf,IAAA,gCAAsB,EACpB,aAAa,CAAC,OAAO,EACrB,YAAY,CAAC,QAAQ,EAAE,EACvB,0BAAS,CAAC,QAAQ,EAClB,aAAa,CACd,CACF,CAAC;SACH;KACF;IAED,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,SAAS,EAAE,0BAAS,CAAC,QAAQ;YAC7B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,IAAA,+BAAc,EAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACvD,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;SAC/B,CAAC,CAAC;KACJ;IAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,SAAS,EAAE,0BAAS,CAAC,QAAQ;YAC7B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,IAAA,+BAAc,EAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC1D,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;SAClC,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,kBAAkB;IACnC,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
@@ -28,15 +28,15 @@ function getVoteTokensFetcher(config) {
28
28
  functionName: 'locked',
29
29
  args: [owner],
30
30
  };
31
- const results = yield client.readContract(contract);
32
- if (results[0] === BigInt(0))
31
+ const [balance, lockedUntil] = yield client.readContract(contract);
32
+ if (balance === BigInt(0))
33
33
  return [];
34
34
  const tokenPrice = yield cache.getTokenPrice(stgAddress, networkId);
35
35
  if (!tokenPrice)
36
36
  return [];
37
- const amountLocked = Number(results[0]) / Math.pow(10, tokenPrice.decimals);
37
+ const amountLocked = Number(balance) / Math.pow(10, tokenPrice.decimals);
38
38
  const assets = [
39
- (0, tokenPriceToAssetToken_1.default)(stgAddress, amountLocked, networkId, tokenPrice, tokenPrice.price),
39
+ Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(stgAddress, amountLocked, networkId, tokenPrice, tokenPrice.price)), { lockedUntil: Number(lockedUntil) }),
40
40
  ];
41
41
  const value = amountLocked * tokenPrice.price;
42
42
  const liquidity = {
@@ -1 +1 @@
1
- {"version":3,"file":"getVoteTokensFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/stargate/getVoteTokensFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,iDAAmD;AAGnD,iCAAmC;AACnC,2CAAyC;AACzC,qGAA6E;AAG7E,SAAgB,oBAAoB,CAAC,MAAiB;IACpD,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IACvD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,SAAS,CAAC,CAAC;QAEvC,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,gBAAS;YACd,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,CAAC,KAAsB,CAAC;SACtB,CAAC;QACX,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC;YAAE,OAAO,EAAE,CAAC;QAExC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAE3B,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;QAEpE,MAAM,MAAM,GAA0B;YACpC,IAAA,gCAAsB,EACpB,UAAU,EACV,YAAY,EACZ,SAAS,EACT,UAAU,EACV,UAAU,CAAC,KAAK,CACjB;SACF,CAAC;QACF,MAAM,KAAK,GAAG,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC;QAE9C,MAAM,SAAS,GAAuB;YACpC,MAAM;YACN,WAAW,EAAE,KAAK;YAClB,KAAK;YACL,MAAM,EAAE,EAAE;YACV,YAAY,EAAE,EAAE;YAChB,iBAAiB,EAAE,IAAI;SACxB,CAAC;QAEF,OAAO;YACL;gBACE,SAAS;gBACT,UAAU,EAAV,sBAAU;gBACV,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,qCAAoB,CAAC,SAAS;gBACpC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE;gBAClC,KAAK;gBACL,IAAI,EAAE,eAAe;aACtB;SACF,CAAC;IACJ,CAAC,CAAA,CAAC;IACF,OAAO;QACL,QAAQ;QACR,SAAS;QACT,EAAE,EAAE,GAAG,sBAAU,IAAI,SAAS,UAAU;KACzC,CAAC;AACJ,CAAC;AAxDD,oDAwDC"}
1
+ {"version":3,"file":"getVoteTokensFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/stargate/getVoteTokensFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,iDAAmD;AAGnD,iCAAmC;AACnC,2CAAyC;AACzC,qGAA6E;AAG7E,SAAgB,oBAAoB,CAAC,MAAiB;IACpD,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IACvD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,SAAS,CAAC,CAAC;QAEvC,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,gBAAS;YACd,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,CAAC,KAAsB,CAAC;SACtB,CAAC;QACX,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC;YAAE,OAAO,EAAE,CAAC;QAErC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAE3B,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;QAEjE,MAAM,MAAM,GAA0B;4CAE/B,IAAA,gCAAsB,EACvB,UAAU,EACV,YAAY,EACZ,SAAS,EACT,UAAU,EACV,UAAU,CAAC,KAAK,CACjB,KACD,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;SAEnC,CAAC;QACF,MAAM,KAAK,GAAG,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC;QAE9C,MAAM,SAAS,GAAuB;YACpC,MAAM;YACN,WAAW,EAAE,KAAK;YAClB,KAAK;YACL,MAAM,EAAE,EAAE;YACV,YAAY,EAAE,EAAE;YAChB,iBAAiB,EAAE,IAAI;SACxB,CAAC;QAEF,OAAO;YACL;gBACE,SAAS;gBACT,UAAU,EAAV,sBAAU;gBACV,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,qCAAoB,CAAC,SAAS;gBACpC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE;gBAClC,KAAK;gBACL,IAAI,EAAE,eAAe;aACtB;SACF,CAAC;IACJ,CAAC,CAAA,CAAC;IACF,OAAO;QACL,QAAQ;QACR,SAAS;QACT,EAAE,EAAE,GAAG,sBAAU,IAAI,SAAS,UAAU;KACzC,CAAC;AACJ,CAAC;AA3DD,oDA2DC"}
@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
54
54
  }
55
55
  function getV3PairsAddresses(url, length = 300) {
56
56
  return __awaiter(this, void 0, void 0, function* () {
57
- const query = (0, graphql_request_1.gql) `
58
- {
59
- pools(
60
- orderBy: totalValueLockedUSD
61
- first: ${length}
62
- orderDirection: desc
63
- where: { volumeUSD_not: "0", liquidity_not: "0" }
64
- ) {
65
- id
66
- token0Price
67
- token1Price
68
- liquidity
69
- token0 {
70
- id
71
- totalSupply
72
- decimals
73
- }
74
- token1 {
75
- id
76
- totalSupply
77
- decimals
78
- }
79
- }
80
- }
57
+ const query = (0, graphql_request_1.gql) `
58
+ {
59
+ pools(
60
+ orderBy: totalValueLockedUSD
61
+ first: ${length}
62
+ orderDirection: desc
63
+ where: { volumeUSD_not: "0", liquidity_not: "0" }
64
+ ) {
65
+ id
66
+ token0Price
67
+ token1Price
68
+ liquidity
69
+ token0 {
70
+ id
71
+ totalSupply
72
+ decimals
73
+ }
74
+ token1 {
75
+ id
76
+ totalSupply
77
+ decimals
78
+ }
79
+ }
80
+ }
81
81
  `;
82
82
  const res = yield (0, graphql_request_1.default)(url, query);
83
83
  const pools = res.pools;
@@ -40,28 +40,28 @@ function getPairKey(version) {
40
40
  exports.getPairKey = getPairKey;
41
41
  function getPairsV2FromTheGraph(url, length = 300) {
42
42
  return __awaiter(this, void 0, void 0, function* () {
43
- const query = (0, graphql_request_1.gql) `
44
- {
45
- pairs(
46
- orderBy: reserveUSD
47
- first: ${length}
48
- orderDirection: desc
49
- where: { trackedReserveETH_not: "0" }
50
- ) {
51
- id
52
- reserve0
53
- reserve1
54
- totalSupply
55
- token0 {
56
- id
57
- decimals
58
- }
59
- token1 {
60
- id
61
- decimals
62
- }
63
- }
64
- }
43
+ const query = (0, graphql_request_1.gql) `
44
+ {
45
+ pairs(
46
+ orderBy: reserveUSD
47
+ first: ${length}
48
+ orderDirection: desc
49
+ where: { trackedReserveETH_not: "0" }
50
+ ) {
51
+ id
52
+ reserve0
53
+ reserve1
54
+ totalSupply
55
+ token0 {
56
+ id
57
+ decimals
58
+ }
59
+ token1 {
60
+ id
61
+ decimals
62
+ }
63
+ }
64
+ }
65
65
  `;
66
66
  const res = yield (0, graphql_request_1.default)(url, query);
67
67
  const pairs = res.pairs;