allow recommitment by reward bots

subsquid · May 27, 2024 · 1548675 · 1548675 · github-actions · May 27, 2024
1 parent 8d3a718
commit 1548675
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/packages/rewards-calculator/src/chain.ts b/packages/rewards-calculator/src/chain.ts
@@ -200,11 +200,40 @@ async function sendApproveRequest(
   return sendFordefiTransaction(request);
 }
 
+async function tryToRecommit(
+  fromBlock: number,
+  toBlock: number,
+  rewards: Rewards,
+  address: Hex,
+  commitment?: Hex,
+) {
+  if (!commitment) return;
+  if (
+    await contracts.rewardsDistribution.read.alreadyApproved([
+      commitment,
+      address,
+    ])
+  ) {
+    return;
+  }
+  const { workerIds, rewardAmounts, stakedAmounts } = rewardsToTxArgs(rewards);
+  const tx = await sendCommitRequest(
+    BigInt(fromBlock),
+    BigInt(toBlock),
+    workerIds,
+    rewardAmounts,
+    stakedAmounts,
+  );
+  logger.log("Recommit rewards", tx);
+  return tx;
+}
+
 export async function approveRewards(
   fromBlock: number,
   toBlock: number,
   rewards: Rewards,
   address: Hex,
+  commitment?: Hex,
 ) {
   const { workerIds, rewardAmounts, stakedAmounts } = rewardsToTxArgs(rewards);
   if (
@@ -217,7 +246,14 @@ export async function approveRewards(
       stakedAmounts,
     ]))
   ) {
-    logger.log("Cannot approve rewards", address);
+    const tx = await tryToRecommit(
+      fromBlock,
+      toBlock,
+      rewards,
+      address,
+      commitment,
+    );
+    if (!tx) logger.log("Cannot approve rewards", address);
     return;
   }
   const tx = await sendApproveRequest(

diff --git a/packages/rewards-calculator/src/clickhouseClient.ts b/packages/rewards-calculator/src/clickhouseClient.ts
@@ -60,7 +60,7 @@ export class ClickhouseClient {
       config.clickhouse.logsTableName
     }.worker_timestamp >= '${formatDate(this.from)}' and ${
       config.clickhouse.logsTableName
-    }.worker_timestamp <= '${formatDate(this.to)}'`;
+    }.worker_timestamp <= '${formatDate(this.to)}' order by query_hash`;
     for await (const row of clickhouse.query(query).stream()) {
       const worker = this.workers.add(row.worker_id);
       await worker.processQuery(row);

diff --git a/packages/rewards-calculator/src/rewardBot.ts b/packages/rewards-calculator/src/rewardBot.ts
@@ -98,6 +98,7 @@ export class RewardBot {
           ranges.toBlock,
           rewards,
           this.address,
+          ranges.commitment,
         );
         if (tx) {
           console.log(
@@ -149,6 +150,7 @@ async function approveRanges(): Promise<
       shouldApprove: true;
       fromBlock: number;
       toBlock: number;
+      commitment?: Hex;
     }
 > {
   const commitmentBlocks = (
@@ -159,10 +161,11 @@ async function approveRanges(): Promise<
       ),
       fromBlock: 1n,
     })
-  ).map(({ args: { fromBlock, toBlock }, blockNumber }) => ({
+  ).map(({ args: { fromBlock, toBlock, commitment }, blockNumber }) => ({
     fromBlock: Number(fromBlock),
     toBlock: Number(toBlock),
     blockNumber: Number(blockNumber),
+    commitment,
   }));
 
   if (commitmentBlocks.length === 0) {