Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

only return preferred staking balance #92

Closed
wants to merge 1 commit into from
Closed

only return preferred staking balance #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 61 additions & 17 deletions modules/pool/lib/pool-gql-loader.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
PrismaPoolTokenWithExpandedNesting,
prismaPoolWithExpandedNesting,
PrismaPoolWithExpandedNesting,
PrismaStakedBalanceWithGauge,
prismaUserStakedBalanceWithGauge,
} from '../../../prisma/prisma-types';
import {
GqlBalancePoolAprItem,
Expand Down Expand Up @@ -44,7 +46,7 @@ import { networkContext } from '../../network/network-context.service';
import { fixedNumber } from '../../view-helpers/fixed-number';
import { parseUnits } from 'ethers/lib/utils';
import { formatFixed } from '@ethersproject/bignumber';
import { BalancerChainIds, BeethovenChainIds, chainIdToChain, chainToIdMap } from '../../network/network-config';
import { BalancerChainIds, BeethovenChainIds, chainToIdMap } from '../../network/network-config';
import { GithubContentService } from '../../content/github-content.service';
import { SanityContentService } from '../../content/sanity-content.service';
import { FeaturedPool } from '../../content/content-types';
Expand All @@ -69,7 +71,7 @@ export class PoolGqlLoaderService {
throw new Error('Pool exists, but has an unknown type');
}

return this.mapPoolToGqlPool(pool, pool.userWalletBalances, pool.userStakedBalances);
return this.mapPoolToGqlPool(pool, this.getWalletBalance(pool.userWalletBalances), this.getStakedBalance(pool));
}

public async getPools(args: QueryPoolGetPoolsArgs): Promise<GqlPoolMinimal[]> {
Expand All @@ -93,7 +95,11 @@ export class PoolGqlLoaderService {
});

const gqlPools = pools.map((pool) =>
this.mapToMinimalGqlPool(pool, pool.userWalletBalances, pool.userStakedBalances),
this.mapToMinimalGqlPool(
pool,
this.getWalletBalance(pool.userWalletBalances),
this.getStakedBalance(pool),
),
);

if (args.orderBy === 'userbalanceUsd') {
Expand Down Expand Up @@ -153,8 +159,8 @@ export class PoolGqlLoaderService {

public mapToMinimalGqlPool(
pool: PrismaPoolMinimal,
userWalletbalances: PrismaUserWalletBalance[] = [],
userStakedBalances: PrismaUserStakedBalance[] = [],
userWalletbalance?: PrismaUserWalletBalance,
userStakedBalance?: PrismaUserStakedBalance,
): GqlPoolMinimal {
return {
...pool,
Expand All @@ -163,7 +169,7 @@ export class PoolGqlLoaderService {
allTokens: this.mapAllTokens(pool),
displayTokens: this.mapDisplayTokens(pool),
staking: this.getStakingData(pool),
userBalance: this.getUserBalance(pool, userWalletbalances, userStakedBalances),
userBalance: this.getUserBalance(pool, userWalletbalance, userStakedBalance),
};
}

Expand Down Expand Up @@ -460,8 +466,8 @@ export class PoolGqlLoaderService {

private mapPoolToGqlPool(
pool: PrismaPoolWithExpandedNesting,
userWalletbalances: PrismaUserWalletBalance[] = [],
userStakedBalances: PrismaUserStakedBalance[] = [],
userWalletbalance?: PrismaUserWalletBalance,
userStakedBalance?: PrismaUserStakedBalance,
): GqlPoolUnion {
const bpt = pool.tokens.find((token) => token.address === pool.address);

Expand All @@ -476,7 +482,7 @@ export class PoolGqlLoaderService {
tokens: pool.tokens.map((token) => this.mapPoolTokenToGqlUnion(token)),
allTokens: this.mapAllTokens(pool),
displayTokens: this.mapDisplayTokens(pool),
userBalance: this.getUserBalance(pool, userWalletbalances, userStakedBalances),
userBalance: this.getUserBalance(pool, userWalletbalance, userStakedBalance),
};

//TODO: may need to build out the types here still
Expand Down Expand Up @@ -746,22 +752,22 @@ export class PoolGqlLoaderService {

private getUserBalance(
pool: PrismaPoolMinimal,
userWalletBalances: PrismaUserWalletBalance[],
userStakedBalances: PrismaUserStakedBalance[],
userWalletBalance?: PrismaUserWalletBalance,
userStakedBalance?: PrismaUserStakedBalance,
): GqlPoolUserBalance {
let bptPrice = 0;
if (pool.dynamicData && pool.dynamicData.totalLiquidity > 0 && parseFloat(pool.dynamicData.totalShares) > 0) {
bptPrice = pool.dynamicData.totalLiquidity / parseFloat(pool.dynamicData.totalShares);
}

const walletBalance = parseUnits(userWalletBalances.at(0)?.balance || '0', 18);
const stakedBalance = parseUnits(userStakedBalances.at(0)?.balance || '0', 18);
const walletBalanceNum = userWalletBalances.at(0)?.balanceNum || 0;
const stakedBalanceNum = userStakedBalances.at(0)?.balanceNum || 0;
const walletBalance = parseUnits(userWalletBalance?.balance || '0', 18);
const stakedBalance = parseUnits(userStakedBalance?.balance || '0', 18);
const walletBalanceNum = userWalletBalance?.balanceNum || 0;
const stakedBalanceNum = userStakedBalance?.balanceNum || 0;

return {
walletBalance: userWalletBalances.at(0)?.balance || '0',
stakedBalance: userStakedBalances.at(0)?.balance || '0',
walletBalance: userWalletBalance?.balance || '0',
stakedBalance: userStakedBalance?.balance || '0',
totalBalance: formatFixed(stakedBalance.add(walletBalance), 18),
walletBalanceUsd: walletBalanceNum * bptPrice,
stakedBalanceUsd: stakedBalanceNum * bptPrice,
Expand Down Expand Up @@ -1334,7 +1340,45 @@ export class PoolGqlLoaderService {
},
balanceNum: { gt: 0 },
},
prismaUserStakedBalanceWithGauge,
},
};
}

getWalletBalance(userWalletBalances: PrismaUserWalletBalance[]): PrismaUserWalletBalance | undefined {
if (userWalletBalances.length === 0) {
return undefined;
}
if (userWalletBalances.length === 1) {
return userWalletBalances[0];
}

throw new Error(
`User ${userWalletBalances[0].userAddress} has multiple wallet balances for pool ${userWalletBalances[0].poolId} on chain ${userWalletBalances[0].chain}`,
);
}

getStakedBalance(
pool: PrismaPoolMinimal & { userStakedBalances: PrismaUserStakedBalance[] & {} },
): PrismaUserStakedBalance | undefined {
if (pool.userStakedBalances.length === 0) {
return undefined;
}
if (pool.userStakedBalances.length === 1) {
return pool.userStakedBalances[0];
}

const preferredGaugeId = pool.staking.find((staking) => staking.gauge?.status === 'PREFERRED')?.id;

if (!preferredGaugeId) {
return undefined;
}

for (const balance of pool.userStakedBalances) {
if (balance.stakingId === preferredGaugeId) {
return balance;
}
}
return undefined;
}
}
40 changes: 27 additions & 13 deletions prisma/prisma-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,20 +278,34 @@ export const prismaPoolBatchSwapWithSwaps = Prisma.validator<Prisma.PrismaPoolBa
export type PrismaPoolBatchSwapWithSwaps = Prisma.PrismaPoolBatchSwapGetPayload<typeof prismaPoolBatchSwapWithSwaps>;

export const prismaPoolWithDynamic = Prisma.validator<Prisma.PrismaPoolArgs>()({
include: {
stableDynamicData: true,
include: {
stableDynamicData: true,
dynamicData: true,
linearDynamicData: true,
linearData: true,
gyroData: true,
tokens: {
orderBy: { index: 'asc' },
include: {
token: true,
dynamicData: true,
linearDynamicData: true,
linearData: true,
gyroData: true,
tokens: {
orderBy: { index: 'asc' },
include: {
token: true,
dynamicData: true,
},
},
}
},
},
},
});

export type PrismaPoolWithDynamic = Prisma.PrismaPoolGetPayload<typeof prismaPoolWithDynamic>;

export const prismaUserStakedBalanceWithGauge = Prisma.validator<Prisma.PrismaUserStakedBalanceArgs>()({
include: {
staking: {
include: {
gauge: true,
},
},
},
});

export type PrismaStakedBalanceWithGauge = Prisma.PrismaUserStakedBalanceGetPayload<
typeof prismaUserStakedBalanceWithGauge
>;
Loading