Fix centrifuge block rewards check

opensquare-network · Nov 26, 2023 · 2cff43e · 2cff43e
1 parent 9525f23
commit 2cff43e
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 9 deletions.
diff --git a/packages/input-scan/src/business/event/centrifuge/blockRewards/index.js b/packages/input-scan/src/business/event/centrifuge/blockRewards/index.js
@@ -1,4 +1,6 @@
 const { getCfgBlockRewardCol } = require("../../../../mongo/data");
+const { findRewardFromNextEvent } = require("./nextEvent");
+const { findRewardFromNoExtrinsicEvents } = require("./noExtrinsicEvent");
 
 function extractCollatorRewardInfo(blockEvents, treasuryDepositSort) {
   const groupRewardedEvent = blockEvents[treasuryDepositSort - 2];
@@ -21,25 +23,25 @@ async function handleCentrifugeBlockRewards(event, indexer, blockEvents) {
     return;
   }
 
-  const nextEvent = blockEvents[sort + 1];
-  const { event: { section, method } } = nextEvent;
-  if (section !== "blockRewards" || method !== "NewSession") {
+  let rewardInfo = findRewardFromNextEvent(blockEvents, sort);
+  if (!rewardInfo) {
+    rewardInfo = findRewardFromNoExtrinsicEvents(blockEvents, sort);
+  }
+  if (!rewardInfo) {
     return;
   }
 
   const balance = event.data[0].toString();
-  const eachCollatorReward = nextEvent.event.data[0].toString();
-  const totalReward = nextEvent.event.data[1].toString();
-
+  const { eachCollatorReward, totalReward } = rewardInfo;
   const collatorRewardInfo = extractCollatorRewardInfo(blockEvents, sort);
   if (!collatorRewardInfo) {
     throw new Error(`Can not get centrifuge collator reward info at ${ indexer.blockHeight }`);
   }
 
   const obj = {
     indexer,
-    section,
-    method,
+    section: "blockRewards",
+    method: "NewSession",
     balance,
     totalReward,
     eachCollatorReward,

diff --git a/packages/input-scan/src/business/event/centrifuge/blockRewards/nextEvent.js b/packages/input-scan/src/business/event/centrifuge/blockRewards/nextEvent.js
@@ -0,0 +1,18 @@
+function findRewardFromNextEvent(blockEvents, sort) {
+  const nextEvent = blockEvents[sort + 1];
+  const { event: { section, method } } = nextEvent;
+  if (section !== "blockRewards" || method !== "NewSession") {
+    return;
+  }
+
+  const eachCollatorReward = nextEvent.event.data[0].toString();
+  const totalReward = nextEvent.event.data[1].toString();
+  return {
+    eachCollatorReward,
+    totalReward,
+  }
+}
+
+module.exports = {
+  findRewardFromNextEvent,
+}
diff --git a/packages/input-scan/src/business/event/centrifuge/blockRewards/noExtrinsicEvent.js b/packages/input-scan/src/business/event/centrifuge/blockRewards/noExtrinsicEvent.js
@@ -0,0 +1,21 @@
+function findRewardFromNoExtrinsicEvents(blockEvents, sort) {
+  const noExtrinsicEvents = blockEvents.filter((e, index) => e.phase.isNone && index > sort);
+  const targetEvent = noExtrinsicEvents.find(({ event }) => {
+    const { section, method } = event;
+    return section === "blockRewards" && method === "NewSession";
+  });
+  if (!targetEvent) {
+    return;
+  }
+
+  const eachCollatorReward = targetEvent.event.data[0].toString();
+  const totalReward = targetEvent.event.data[1].toString();
+  return {
+    eachCollatorReward,
+    totalReward,
+  }
+}
+
+module.exports = {
+  findRewardFromNoExtrinsicEvents,
+}
diff --git a/packages/input-scan/src/play.js b/packages/input-scan/src/play.js
@@ -9,7 +9,7 @@ const {
 
 async function test() {
   const blockHeights = [
-    1499998,
+    4330800,
   ];
 
   for (const height of blockHeights) {