feat(staking): listener should get validator address anyhow

XP-NETWORK · Aug 15, 2024 · 500f011 · 500f011
1 parent 7a4edab
commit 500f011
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/handler/evm/utils/listenForStakingEvents.ts b/src/handler/evm/utils/listenForStakingEvents.ts
@@ -1,7 +1,7 @@
 import type { EntityManager } from "@mikro-orm/sqlite";
 import type { JsonRpcProvider } from "ethers";
 import type { EventBuilder } from "../..";
-import type { TSupportedChains } from "../../../config";
+import type { TSupportedChainTypes, TSupportedChains } from "../../../config";
 import { ERC20Staking__factory } from "../../../contractsTypes/evm";
 import { Block } from "../../../persistence/entities/block";
 import type { LogInstance, StakeEventIter } from "../../types";
@@ -55,8 +55,20 @@ const listenForStakingEvents = (
         }
         for (const log of logs) {
           const decoded = stakerInt.parseLog(log);
+          const receipt = await log.getTransactionReceipt();
           if (!decoded) continue;
-          await cb(builder.staked(decoded.args.validatorAddressAndChainType));
+          await cb(
+            builder.staked(
+              // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+              decoded.args.validatorAddressAndChainType.map((e: any) => {
+                return {
+                  caller: receipt.from,
+                  chainType: e.chainType as TSupportedChainTypes,
+                  validatorAddress: e.validatorAddress,
+                };
+              }),
+            ),
+          );
         }
         lastBlock = latestBlock;
         await em.upsert(Block, {

diff --git a/src/handler/index.ts b/src/handler/index.ts
@@ -174,10 +174,7 @@ export async function listenStakeEvents(
     log.info("Listening for Staking Events");
 
     chain.listenForStakingEvents(builder, async (ev) => {
-      const stakerAddress = ev.find(
-        (item) => item.chainType === "evm",
-      )?.validatorAddress;
-      if (!stakerAddress) return;
+      const stakerAddress = ev[0].caller;
 
       const signatures: {
         validatorAddress: string;

diff --git a/src/handler/types.ts b/src/handler/types.ts
@@ -70,6 +70,7 @@ export type LockEvent = {
 
 export type StakeEvent = {
   validatorAddress: string;
+  caller: string;
   chainType: TSupportedChainTypes;
 }[];