@sonarwatch/portfolio-plugins 0.8.114 → 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 +9 -1
- package/package.json +2 -2
- package/src/plugins/balancer/helpers/pools.js +21 -21
- package/src/plugins/goosefx/stakingFetcher.js +13 -12
- package/src/plugins/goosefx/stakingFetcher.js.map +1 -1
- package/src/plugins/jupiter/perpetualFetcher.js +4 -1
- package/src/plugins/jupiter/perpetualFetcher.js.map +1 -1
- package/src/plugins/lifinity/lockerFetcher.js +8 -13
- package/src/plugins/lifinity/lockerFetcher.js.map +1 -1
- package/src/plugins/lifinity/structs.d.ts +4 -4
- package/src/plugins/lifinity/structs.js +4 -4
- package/src/plugins/lifinity/structs.js.map +1 -1
- package/src/plugins/paraswap/stakingFetcher.js +6 -7
- package/src/plugins/paraswap/stakingFetcher.js.map +1 -1
- package/src/plugins/stargate/getVoteTokensFetcher.js +4 -4
- package/src/plugins/stargate/getVoteTokensFetcher.js.map +1 -1
- package/src/plugins/sushiswap/helpers.js +24 -24
- package/src/plugins/uniswap-v2/helpers.js +22 -22
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.
|
|
5
|
+
## [0.8.116](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.115...plugins-0.8.116) (2023-12-01)
|
|
6
6
|
|
|
7
7
|
|
|
8
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
|
+
|
|
9
17
|
## [0.8.113](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.112...plugins-0.8.113) (2023-11-29)
|
|
10
18
|
|
|
11
19
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.8.
|
|
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.
|
|
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
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
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
|
-
|
|
41
|
-
|
|
42
|
-
const
|
|
43
|
-
|
|
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;
|
|
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"}
|
|
@@ -27,7 +27,8 @@ const usdFactor = new bignumber_js_1.default(Math.pow(10, 6));
|
|
|
27
27
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
28
|
const client = (0, clients_1.getClientSolana)();
|
|
29
29
|
const perpetualsPositions = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.positionStruct, constants_1.perpsProgramId, (0, filters_1.perpetualsPositionsFilter)(owner));
|
|
30
|
-
if (perpetualsPositions.length === 0
|
|
30
|
+
if (perpetualsPositions.length === 0 ||
|
|
31
|
+
!perpetualsPositions.some((perp) => perp.sizeUsd.isGreaterThan(0)))
|
|
31
32
|
return [];
|
|
32
33
|
const custodiesAccounts = yield cache.getItem(constants_1.custodiesKey, {
|
|
33
34
|
prefix: constants_1.platformId,
|
|
@@ -48,6 +49,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
48
49
|
tokensDetails.forEach((tD) => tD ? tokensDetailsById.set(tD.address, tD) : undefined);
|
|
49
50
|
const elements = [];
|
|
50
51
|
for (const position of perpetualsPositions) {
|
|
52
|
+
if (position.sizeUsd.isLessThanOrEqualTo(0))
|
|
53
|
+
continue;
|
|
51
54
|
if (position.side === structs_1.Side.None)
|
|
52
55
|
continue;
|
|
53
56
|
const isLong = position.side === structs_1.Side.Long;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/perpetualFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,gEAAqC;AACrC,6CAA4C;AAG5C,2CAAuE;AACvE,iDAAsD;AACtD,+CAA8D;AAC9D,uCAAiD;AACjD,uCAAsD;AAEtD,gGAA6F;AAC7F,6DAAwE;AACxE,mDAA8D;AAE9D,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;AACzC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAwB,EACxD,MAAM,EACN,wBAAc,EACd,0BAAc,EACd,IAAA,mCAAyB,EAAC,KAAK,CAAC,CACjC,CAAC;IACF,
|
|
1
|
+
{"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/perpetualFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
-
|
|
29
|
-
const { amount } = escrowAccount;
|
|
28
|
+
const { amount, escrowEndsAt, duration } = escrowAccount;
|
|
30
29
|
if (amount.isZero())
|
|
31
30
|
return [];
|
|
32
|
-
const
|
|
33
|
-
|
|
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
|
|
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
|
|
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,
|
|
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
|
-
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
escrowStartedAt: BigNumber;
|
|
23
|
+
escrowEndsAt: BigNumber;
|
|
24
|
+
initialAmount: BigNumber;
|
|
25
25
|
duration: BigNumber;
|
|
26
|
-
|
|
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
|
-
['
|
|
24
|
-
['
|
|
25
|
-
['
|
|
23
|
+
['escrowStartedAt', solana_1.i64],
|
|
24
|
+
['escrowEndsAt', solana_1.i64],
|
|
25
|
+
['initialAmount', solana_1.i64],
|
|
26
26
|
['duration', solana_1.i64],
|
|
27
|
-
['
|
|
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,
|
|
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
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
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":";;;;;;;;;;;;;;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,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,
|
|
1
|
+
{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/paraswap/stakingFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,15 +28,15 @@ function getVoteTokensFetcher(config) {
|
|
|
28
28
|
functionName: 'locked',
|
|
29
29
|
args: [owner],
|
|
30
30
|
};
|
|
31
|
-
const
|
|
32
|
-
if (
|
|
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(
|
|
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;
|
|
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;
|