Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class RelayerAutomaticRedeemService {
await this.processAutoRedeem();
} catch (error) {
this.logger.error('Auto-redeem job failed:', error);
throw error;
} finally {
this.isRunning = false;
}
Expand Down Expand Up @@ -93,41 +94,38 @@ export class RelayerAutomaticRedeemService {
}

private async findPendingRedeems(lastReport: any): Promise<any[]> {
try {
const pendingRedeems = await this.prismaService.redeemRequested.findMany({
where: {
redeemId: {
notIn: await this.prismaService.redeemClaimed
.findMany({
select: { redeemId: true },
})
.then((claims) => claims.map((c) => c.redeemId)),
},
epoch: {
lte: lastReport.newHandledEpochLen || 0n,
},
const pendingRedeems = await this.prismaService.redeemRequested.findMany({
where: {
redeemId: {
notIn: await this.prismaService.redeemClaimed
.findMany({
select: { redeemId: true },
})
.then((claims) => claims.map((c) => c.redeemId)),
},
orderBy: { redeemId: 'asc' },
take: BATCH_SIZE_FOR_CLAIM_MULTIPLE_REDEEMS * 5,
});
epoch: {
lte: lastReport.newHandledEpochLen || 0n,
},
},
orderBy: { redeemId: 'asc' },
take: BATCH_SIZE_FOR_CLAIM_MULTIPLE_REDEEMS * 5,
});

this.logger.debug('Found pending redeems from database', {
count: pendingRedeems.length,
epochFilter: lastReport.newHandledEpochLen?.toString(),
});
this.logger.debug('Found pending redeems from database', {
count: pendingRedeems.length,
epochFilter: lastReport.newHandledEpochLen?.toString(),
});

return pendingRedeems;
} catch (error) {
this.logger.error('Error finding pending redeems:', error);
return [];
}
return pendingRedeems;
}

private async processPendingRedeemsBatches(pendingRedeems: any[]): Promise<void> {
const batches = this.chunkArray(pendingRedeems, BATCH_SIZE_FOR_CLAIM_MULTIPLE_REDEEMS);

this.logger.info(`Processing ${batches.length} batches of redeems`);

const batchErrors: { batchIndex: number; error: unknown }[] = [];

for (let i = 0; i < batches.length; i++) {
const batch = batches[i];
try {
Expand All @@ -141,8 +139,20 @@ export class RelayerAutomaticRedeemService {
}
} catch (error) {
this.logger.error(`Error processing batch ${i + 1}:`, error);
batchErrors.push({ batchIndex: i + 1, error });
}
}

if (batchErrors.length > 0) {
const nested = batchErrors.map(({ batchIndex, error }) => {
const detail = error instanceof Error ? error.message : String(error);
return new Error(`batch ${batchIndex}/${batches.length}: ${detail}`);
});
throw new AggregateError(
nested,
`auto-redeem: ${batchErrors.length} of ${batches.length} batch(es) failed`
);
}
}

private async processBatch(batch: any[]): Promise<void> {
Expand Down