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.

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

[MEX-514] compute user boosted apr #1457

Merged
merged 8 commits into from
Sep 11, 2024
7 changes: 7 additions & 0 deletions src/modules/farm/mocks/farm.v2.abi.service.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ export class FarmAbiServiceMockV2
async farmPositionMigrationNonce(farmAddress: string): Promise<number> {
return 10;
}

async farmSupplyForWeek(
farmAddress: string,
week: number,
): Promise<string> {
return '2';
}
}

export const FarmAbiServiceProviderV2 = {
Expand Down
6 changes: 6 additions & 0 deletions src/modules/farm/models/farm.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,18 @@ export class RewardsModel {
export class BoostedRewardsModel {
@Field()
farmAddress: string;
@Field()
userAddress: string;
@Field(() => [UserInfoByWeekModel], { nullable: true })
boostedRewardsWeeklyInfo: UserInfoByWeekModel[];
@Field(() => ClaimProgress, { nullable: true })
claimProgress: ClaimProgress;
@Field({ nullable: true })
accumulatedRewards: string;
@Field({ nullable: true })
curentBoostedAPR: number;
@Field({ nullable: true })
maximumBoostedAPR: number;

constructor(init?: Partial<BoostedRewardsModel>) {
Object.assign(this, init);
Expand Down
14 changes: 12 additions & 2 deletions src/modules/farm/specs/farm.v2.compute.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { FarmAbiServiceV2 } from '../v2/services/farm.v2.abi.service';
import { Address } from '@multiversx/sdk-core/out';
import { ContextGetterService } from 'src/services/context/context.getter.service';
import { ElasticSearchModule } from 'src/services/elastic-search/elastic.search.module';
import { EsdtTokenPayment } from 'src/models/esdtTokenPayment.model';

describe('FarmServiceV2', () => {
let module: TestingModule;
Expand Down Expand Up @@ -131,20 +132,29 @@ describe('FarmServiceV2', () => {
totalLockedTokens: '1',
lastUpdateEpoch: 256,
});
jest.spyOn(
weeklyRewardsSplittingAbi,
'totalRewardsForWeek',
).mockResolvedValue([
new EsdtTokenPayment({
amount: '60480000000000000000000',
tokenID: 'MEX-123456',
}),
]);
jest.spyOn(farmAbi, 'farmTokenSupply').mockResolvedValue('2');
jest.spyOn(farmAbi, 'rewardsPerBlock').mockResolvedValue(
'1000000000000000000',
);
jest.spyOn(farmAbi, 'userTotalFarmPosition').mockResolvedValue('2');

const accumulatedRewards = await service.computeUserAccumulatedRewards(
const accumulatedRewards = await service.computeUserRewardsForWeek(
Address.fromBech32(
'erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqsdtp6mh',
).bech32(),
Address.Zero().bech32(),
1,
);

expect(accumulatedRewards).toEqual('60480000000000000000000');
expect(accumulatedRewards[0].amount).toEqual('60480000000000000000000');
});
});
3 changes: 2 additions & 1 deletion src/modules/farm/v2/farm.v2.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { TokenModule } from 'src/modules/tokens/token.module';
import { ContextModule } from 'src/services/context/context.module';
import { MXCommunicationModule } from 'src/services/multiversx-communication/mx.communication.module';
import { FarmAbiServiceV2 } from './services/farm.v2.abi.service';
import { FarmResolverV2 } from './farm.v2.resolver';
import { FarmBoostedRewardsResolver, FarmResolverV2 } from './farm.v2.resolver';
import { FarmServiceV2 } from './services/farm.v2.service';
import { FarmComputeServiceV2 } from './services/farm.v2.compute.service';
import { PairModule } from 'src/modules/pair/pair.module';
Expand Down Expand Up @@ -36,6 +36,7 @@ import { FarmComputeLoaderV2 } from './services/farm.v2.compute.loader';
FarmTransactionServiceV2,
FarmResolverV2,
FarmTransactionResolverV2,
FarmBoostedRewardsResolver,
],
exports: [
FarmServiceV2,
Expand Down
46 changes: 46 additions & 0 deletions src/modules/farm/v2/farm.v2.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,52 @@ import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
import { FarmAbiLoaderV2 } from './services/farm.v2.abi.loader';
import { FarmComputeLoaderV2 } from './services/farm.v2.compute.loader';

@Resolver(() => BoostedRewardsModel)
export class FarmBoostedRewardsResolver {
constructor(private readonly farmCompute: FarmComputeServiceV2) {}

@ResolveField()
async curentBoostedAPR(
@Parent() parent: BoostedRewardsModel,
@Args('additionalUserFarmAmount', {
type: () => String,
nullable: true,
defaultValue: '0',
})
additionalUserFarmAmount: string,
@Args('additionalUserEnergy', {
type: () => String,
nullable: true,
defaultValue: '0',
})
additionalUserEnergy: string,
): Promise<number> {
return this.farmCompute.computeUserCurentBoostedAPR(
parent.farmAddress,
parent.userAddress,
additionalUserFarmAmount,
additionalUserEnergy,
);
}

@ResolveField()
async maximumBoostedAPR(
@Parent() parent: BoostedRewardsModel,
@Args('additionalUserFarmAmount', {
type: () => String,
nullable: true,
defaultValue: '0',
})
additionalUserFarmAmount: string,
): Promise<number> {
return this.farmCompute.computeUserMaxBoostedAPR(
parent.farmAddress,
parent.userAddress,
additionalUserFarmAmount,
);
}
}

@Resolver(() => FarmModelV2)
export class FarmResolverV2 extends FarmResolver {
constructor(
Expand Down
Loading
Loading