Skip to content

Commit ff12f6c

Browse files
committed
fix: revert rewards changes
1 parent 2e6bf20 commit ff12f6c

File tree

1 file changed

+41
-48
lines changed

1 file changed

+41
-48
lines changed

src/events/rewards/rewards.service.ts

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -78,62 +78,55 @@ export class RewardsService {
7878
}
7979

8080
public async getMinLastTotalRewardsPerFrame() {
81-
const zeroRewardsFallback = {
82-
clRewards: BigNumber.from(0),
83-
elRewards: BigNumber.from(0),
84-
allRewards: BigNumber.from(0),
85-
};
86-
87-
try {
88-
const framesFromLastReports = await this.getFramesFromLastReports();
89-
if (framesFromLastReports === null) {
90-
this.logger.warn(
91-
'last reward reports were not found because last TokenRebase events were not found during last week.',
92-
{ service: RewardsService.SERVICE_LOG_NAME },
93-
);
94-
return zeroRewardsFallback;
95-
}
81+
const framesFromLastReports = await this.getFramesFromLastReports();
82+
if (framesFromLastReports === null) {
83+
this.logger.warn(
84+
'last reward reports were not found because last TokenRebase events were not found during last week.',
85+
{ service: RewardsService.SERVICE_LOG_NAME },
86+
);
87+
return {
88+
clRewards: BigNumber.from(0),
89+
elRewards: BigNumber.from(0),
90+
allRewards: BigNumber.from(0),
91+
};
92+
}
9693

97-
const rewards = await Promise.all(
98-
framesFromLastReports.map(async ({ blockNumber, frames }) => {
99-
const { clRewards, elRewards } = await this.getRewardsByBlockNumber(blockNumber, frames);
94+
const rewards = await Promise.all(
95+
framesFromLastReports.map(async ({ blockNumber, frames }) => {
96+
const { clRewards, elRewards } = await this.getRewardsByBlockNumber(blockNumber, frames);
10097

101-
return {
102-
clRewards,
103-
elRewards,
104-
};
105-
}),
106-
);
98+
return {
99+
clRewards,
100+
elRewards,
101+
};
102+
}),
103+
);
107104

108-
let minCL = rewards[0].clRewards;
109-
let minEL = rewards[0].elRewards;
105+
let minCL = rewards[0].clRewards;
106+
let minEL = rewards[0].elRewards;
110107

111-
// find minimum for last week
112-
rewards.forEach((r) => {
113-
if (minCL.lt(r.clRewards)) {
114-
minCL = r.clRewards;
115-
}
108+
// find minimum for last week
109+
rewards.forEach((r) => {
110+
if (minCL.lt(r.clRewards)) {
111+
minCL = r.clRewards;
112+
}
116113

117-
if (minEL.lt(r.elRewards)) {
118-
minEL = r.elRewards;
119-
}
120-
});
114+
if (minEL.lt(r.elRewards)) {
115+
minEL = r.elRewards;
116+
}
117+
});
121118

122-
const allRewards = minEL.add(minCL);
119+
const allRewards = minEL.add(minCL);
123120

124-
this.logger.log(`rewardsPerFrame are updated to ${allRewards.toString()}`, {
125-
service: RewardsService.SERVICE_LOG_NAME,
126-
});
121+
this.logger.log(`rewardsPerFrame are updated to ${allRewards.toString()}`, {
122+
service: RewardsService.SERVICE_LOG_NAME,
123+
});
127124

128-
return {
129-
clRewards: minCL,
130-
elRewards: minEL,
131-
allRewards,
132-
};
133-
} catch (error) {
134-
this.logger.error('error during calculation rewards per frame', error);
135-
return zeroRewardsFallback;
136-
}
125+
return {
126+
clRewards: minCL,
127+
elRewards: minEL,
128+
allRewards,
129+
};
137130
}
138131

139132
protected async getRewardsByBlockNumber(blockNumber: number, framesPassed: BigNumber) {

0 commit comments

Comments
 (0)