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

[MEX-507] user positions extra information #1444

Merged
merged 4 commits into from
Aug 19, 2024
Merged

[MEX-507] user positions extra information #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0cdc7f
MEX-507: add pair address for user positions
claudiulataretu Aug 19, 2024
fc300f8
MEX-507: use filtering by an array of addresses on filtered queries
claudiulataretu Aug 19, 2024
509357c
MEX-507: add pairAddress information for user tokens positions
claudiulataretu Aug 19, 2024
f0d2bd9
MEX-507: fix unit tests
claudiulataretu Aug 19, 2024
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
6 changes: 3 additions & 3 deletions src/modules/pair/services/pair.filtering.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ export class PairFilteringService {
pairFilter: PairFilterArgs | PairsFilter,
pairsMetadata: PairMetadata[],
): Promise<PairMetadata[]> {
if (pairFilter.address) {
pairsMetadata = pairsMetadata.filter(
(pair) => pairFilter.address === pair.address,
if (pairFilter.addresses) {
pairsMetadata = pairsMetadata.filter((pair) =>
pairFilter.addresses.includes(pair.address),
);
}
return await Promise.resolve(pairsMetadata);
Expand Down
8 changes: 4 additions & 4 deletions src/modules/router/models/filter.args.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ registerEnumType(PairSortableFields, { name: 'PairSortableFields' });

@ArgsType()
export class PairFilterArgs {
@Field({ nullable: true })
address: string;
@Field(() => [String], { nullable: true })
addresses: string[];
@Field({ nullable: true })
firstTokenID: string;
@Field({ nullable: true })
Expand All @@ -34,8 +34,8 @@ export class PairFilterArgs {

@InputType()
export class PairsFilter {
@Field({ nullable: true })
address: string;
@Field(() => [String], { nullable: true })
addresses: string[];
@Field({ nullable: true })
firstTokenID: string;
@Field({ nullable: true })
Expand Down
6 changes: 3 additions & 3 deletions src/modules/router/services/router.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ export class RouterService {
pairFilter: PairFilterArgs,
pairsMetadata: PairMetadata[],
): PairMetadata[] {
if (pairFilter.address) {
pairsMetadata = pairsMetadata.filter(
(pair) => pairFilter.address === pair.address,
if (pairFilter.addresses) {
pairsMetadata = pairsMetadata.filter((pair) =>
pairFilter.addresses.includes(pair.address),
);
}
return pairsMetadata;
Expand Down
6 changes: 3 additions & 3 deletions src/modules/router/specs/router.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe('RouterService', () => {
const filteredPairs = await service.getAllPairs(0, Number.MAX_VALUE, {
firstTokenID: 'WEGLD-123456',
issuedLpToken: true,
address: null,
addresses: null,
secondTokenID: null,
state: null,
feeState: null,
Expand Down Expand Up @@ -146,7 +146,7 @@ describe('RouterService', () => {
const filteredPairs = await service.getAllPairs(0, Number.MAX_VALUE, {
firstTokenID: 'WEGLD-123456',
issuedLpToken: true,
address: null,
addresses: null,
secondTokenID: null,
state: null,
feeState: false,
Expand All @@ -168,7 +168,7 @@ describe('RouterService', () => {
const filteredPairs = await service.getAllPairs(0, Number.MAX_VALUE, {
firstTokenID: null,
issuedLpToken: true,
address: null,
addresses: null,
secondTokenID: null,
state: null,
feeState: null,
Expand Down
16 changes: 8 additions & 8 deletions src/modules/staking-proxy/models/staking.proxy.args.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ export class UnstakeFarmTokensArgs {

@InputType()
export class StakingProxiesFilter {
@Field({ nullable: true })
address: string;
@Field({ nullable: true })
pairAddress: string;
@Field({ nullable: true })
stakingFarmAddress: string;
@Field({ nullable: true })
lpFarmAddress: string;
@Field(() => [String], { nullable: true })
addresses: string[];
@Field(() => [String], { nullable: true })
pairAddresses: string[];
@Field(() => [String], { nullable: true })
stakingFarmAddresses: string[];
@Field(() => [String], { nullable: true })
lpFarmAddresses: string[];
@Field(() => String, { nullable: true })
searchToken?: string;
}
25 changes: 12 additions & 13 deletions src/modules/staking-proxy/services/staking.proxy.filtering.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export class StakingProxyFilteringService {
filter: StakingProxiesFilter,
stakingProxyAddresses: string[],
): string[] {
if (filter.address) {
stakingProxyAddresses = stakingProxyAddresses.filter(
(address) => filter.address === address,
if (filter.addresses) {
stakingProxyAddresses = stakingProxyAddresses.filter((address) =>
filter.addresses.includes(address),
);
}
return stakingProxyAddresses;
Expand All @@ -29,7 +29,7 @@ export class StakingProxyFilteringService {
filter: StakingProxiesFilter,
stakingProxyAddresses: string[],
): Promise<string[]> {
if (!filter.pairAddress) {
if (!filter.pairAddresses) {
return stakingProxyAddresses;
}

Expand All @@ -39,16 +39,16 @@ export class StakingProxyFilteringService {
),
);

return stakingProxyAddresses.filter(
(_, index) => pairAddresses[index] === filter.pairAddress,
return stakingProxyAddresses.filter((_, index) =>
filter.pairAddresses.includes(pairAddresses[index]),
);
}

async stakingProxiesByStakingFarmAdddress(
filter: StakingProxiesFilter,
stakingProxyAddresses: string[],
): Promise<string[]> {
if (!filter.stakingFarmAddress) {
if (!filter.stakingFarmAddresses) {
return stakingProxyAddresses;
}

Expand All @@ -58,17 +58,16 @@ export class StakingProxyFilteringService {
),
);

return stakingProxyAddresses.filter(
(_, index) =>
stakingFarmAddresses[index] === filter.stakingFarmAddress,
return stakingProxyAddresses.filter((_, index) =>
filter.stakingFarmAddresses.includes(stakingFarmAddresses[index]),
);
}

async stakingProxiesByLpFarmAdddress(
filter: StakingProxiesFilter,
stakingProxyAddresses: string[],
): Promise<string[]> {
if (!filter.lpFarmAddress) {
if (!filter.lpFarmAddresses) {
return stakingProxyAddresses;
}

Expand All @@ -78,8 +77,8 @@ export class StakingProxyFilteringService {
),
);

return stakingProxyAddresses.filter(
(_, index) => lpFarmAddresses[index] === filter.lpFarmAddress,
return stakingProxyAddresses.filter((_, index) =>
filter.lpFarmAddresses.includes(lpFarmAddresses[index]),
);
}

Expand Down
9 changes: 9 additions & 0 deletions src/modules/user/models/user.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export enum ContractType {
@ObjectType()
export class UserToken extends EsdtToken {
@Field() valueUSD: string;
@Field({ nullable: true }) pairAddress: string;

constructor(init?: Partial<UserToken>) {
super(init);
Expand Down Expand Up @@ -59,6 +60,7 @@ export class UserLockedAssetToken extends LockedAssetToken {
@ObjectType()
export class UserFarmToken extends FarmToken {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserFarmToken>) {
super(init);
Expand All @@ -69,6 +71,7 @@ export class UserFarmToken extends FarmToken {
@ObjectType()
export class UserLockedLPToken extends LockedLpToken {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserLockedLPToken>) {
super(init);
Expand All @@ -79,6 +82,7 @@ export class UserLockedLPToken extends LockedLpToken {
@ObjectType()
export class UserLockedFarmToken extends LockedFarmToken {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserLockedFarmToken>) {
super(init);
Expand All @@ -89,6 +93,7 @@ export class UserLockedFarmToken extends LockedFarmToken {
@ObjectType()
export class UserLockedLPTokenV2 extends LockedLpTokenV2 {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserLockedLPTokenV2>) {
super(init);
Expand All @@ -99,6 +104,7 @@ export class UserLockedLPTokenV2 extends LockedLpTokenV2 {
@ObjectType()
export class UserLockedFarmTokenV2 extends LockedFarmTokenV2 {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserLockedFarmTokenV2>) {
super(init);
Expand Down Expand Up @@ -129,6 +135,7 @@ export class UserUnbondFarmToken extends UnbondFarmToken {
@ObjectType()
export class UserDualYiledToken extends DualYieldToken {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserDualYiledToken>) {
super(init);
Expand Down Expand Up @@ -157,6 +164,7 @@ export class UserLockedEsdtToken extends LockedEsdtToken {
@ObjectType()
export class UserLockedSimpleLpToken extends LockedSimpleLpToken {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserLockedSimpleLpToken>) {
super(init);
Expand All @@ -167,6 +175,7 @@ export class UserLockedSimpleLpToken extends LockedSimpleLpToken {
@ObjectType()
export class UserLockedSimpleFarmToken extends LockedSimpleFarmToken {
@Field() valueUSD: string;
@Field() pairAddress: string;

constructor(init?: Partial<UserLockedSimpleFarmToken>) {
super(init);
Expand Down
1 change: 1 addition & 0 deletions src/modules/user/services/esdt.compute.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export class UserEsdtComputeService {
return new UserToken({
...esdtToken,
valueUSD: valueUSD,
pairAddress,
});
}
}
11 changes: 11 additions & 0 deletions src/modules/user/services/metaEsdt.compute.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import { StakingProxyAbiService } from 'src/modules/staking-proxy/services/staki
import { FarmAbiFactory } from 'src/modules/farm/farm.abi.factory';
import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
import { TokenComputeService } from 'src/modules/tokens/services/token.compute.service';
import { Address } from '@multiversx/sdk-core/out';

@Injectable()
export class UserMetaEsdtComputeService {
Expand Down Expand Up @@ -113,6 +114,7 @@ export class UserMetaEsdtComputeService {
return new UserToken({
...esdtToken,
valueUSD: valueUSD,
pairAddress,
});
}

Expand Down Expand Up @@ -159,6 +161,7 @@ export class UserMetaEsdtComputeService {
tokenPriceUSD,
).toFixed(),
decodedAttributes: decodedFarmAttributes,
pairAddress: Address.Zero().bech32(),
});
}
const farmTokenBalanceUSD =
Expand All @@ -170,6 +173,7 @@ export class UserMetaEsdtComputeService {
...nftToken,
valueUSD: farmTokenBalanceUSD,
decodedAttributes: decodedFarmAttributes,
pairAddress,
});
}

Expand Down Expand Up @@ -265,6 +269,7 @@ export class UserMetaEsdtComputeService {
...nftToken,
valueUSD: valueUSD,
decodedAttributes: decodedWLPTAttributes,
pairAddress,
});
}
}
Expand All @@ -289,6 +294,7 @@ export class UserMetaEsdtComputeService {
...nftToken,
valueUSD: valueUSD,
decodedAttributes: decodedWLPTAttributes,
pairAddress,
});
}
}
Expand Down Expand Up @@ -325,6 +331,7 @@ export class UserMetaEsdtComputeService {
return new UserLockedFarmToken({
...nftToken,
valueUSD: userFarmToken.valueUSD,
pairAddress: userFarmToken.pairAddress,
decodedAttributes: decodedWFMTAttributes,
});
}
Expand Down Expand Up @@ -373,6 +380,7 @@ export class UserMetaEsdtComputeService {
return new UserLockedFarmTokenV2({
...nftToken,
valueUSD: userFarmToken.valueUSD,
pairAddress: userFarmToken.pairAddress,
decodedAttributes: decodedWFMTAttributes,
});
} catch (e) {
Expand Down Expand Up @@ -503,6 +511,7 @@ export class UserMetaEsdtComputeService {
return new UserDualYiledToken({
...nftToken,
valueUSD: farmTokenUSD.valueUSD,
pairAddress: farmTokenUSD.pairAddress,
decodedAttributes: decodedAttributes[0],
});
}
Expand Down Expand Up @@ -616,6 +625,7 @@ export class UserMetaEsdtComputeService {
...nftToken,
decodedAttributes,
valueUSD: userEsdtToken.valueUSD,
pairAddress,
});
}

Expand Down Expand Up @@ -658,6 +668,7 @@ export class UserMetaEsdtComputeService {
...nftToken,
decodedAttributes,
valueUSD: userFarmToken.valueUSD,
pairAddress: userFarmToken.pairAddress,
});
}

Expand Down
3 changes: 3 additions & 0 deletions src/modules/user/specs/user.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ describe('UserService', () => {
nonce: 1,
royalties: 0,
valueUSD: '20',
pairAddress: Address.fromHex(
'0000000000000000000000000000000000000000000000000000000000000012',
).bech32(),
decodedAttributes: new FarmTokenAttributesModelV1_2({
aprMultiplier: 1,
attributes: 'AAAABQeMCWDbAAAAAAAAAF8CAQ==',
Expand Down
Loading