envio fixes

Author: ilge-ustun

app/src/providers/validatorsProvider.tsx

@@ -8,6 +8,7 @@ import { gnosisBatch } from '@/src/constants/config/rpc-providers'
 import { fromSubgraphTimestamp } from '@/src/utils/date'
 import { Chains, chainsConfig } from '@/src/constants/config/chains'
 import cloneDeep from 'lodash/cloneDeep'
+import { ValidatorStatusTypes } from '@/src/constants/types'
 import {
   TELEPATHY_VALIDATOR_ADDRESS,
   TELEPATHY_VALIDATOR_ADDRESS_REPLACED,
@@ -55,9 +56,9 @@ const fetcher = async () => {
     const validator: Validator = {
       address: v.address.toLowerCase(),
       name,
-      bridgeType: (v.bridgeType || (staticVal?.bridgeType as any) || '') as any,
+      bridgeType: String(v.bridgeType || staticVal?.bridgeType || ''),
       shortName,
-      status: undefined as any,
+      status: ValidatorStatusTypes.default,
       lastSeen: fromSubgraphTimestamp(v.lastActivity),
       signed: Array.isArray(v.signed) ? v.signed.length : 0,
       executed: Array.isArray(v.executed) ? v.executed.length : 0,

app/src/queries/validators.ts

@@ -22,7 +22,7 @@ export const VALIDATORS_QUERY = gql`
 
 export const ENVIO_VALIDATORS_QUERY = `
   query EnvioValidators {
-    Validator(where: { removed: { _eq: false }, hashAdded: { _is_null: false } }) {
+    Validator(where: { removed: { _eq: false } }) {
       id
       name
       bridgeType
@@ -36,7 +36,7 @@ export const ENVIO_VALIDATORS_QUERY = `
 
 export const ENVIO_VALIDATORS_ACTIVITY_QUERY = `
   query EnvioValidatorsActivity($after: numeric!) {
-    Validator(where: { removed: { _eq: false }, hashAdded: { _is_null: false } }) {
+    Validator(where: { removed: { _eq: false } }) {
       address
       name
       bridgeType

app/src/utils/validators.ts

@@ -110,7 +110,16 @@ export const getValidationsStatus = (transaction: Transaction, _validators: Vali
 
 export const fetchHomeValidators = async (filter?: ValidatorsQueryVariables) => {
   if (isEnvioBackend()) {
-    const request = getEnvioGraphqlClient<{ Validator: Array<any> }>()
+    type EnvioValidatorRow = {
+      id?: string
+      name?: string | null
+      bridgeType?: string | null
+      address: string
+      lastActivity?: number | null
+      signed?: Array<{ id: string }>
+      executed?: Array<{ id: string }>
+    }
+    const request = getEnvioGraphqlClient<{ Validator: EnvioValidatorRow[] }>()
     const res = await request(ENVIO_VALIDATORS_QUERY, {})
     return res.Validator
   }
@@ -151,12 +160,19 @@ export const fetchSignedTransactions = async (bridge: BridgesValues, afterDate:
   const validators = VALIDATORS_BY_BRIDGE[bridgeValue]
 
   if (isEnvioBackend()) {
-    const request = getEnvioGraphqlClient<{ Validator: Array<any> }>()
+    type EnvioValidatorRow = {
+      address: string
+      name?: string | null
+      bridgeType?: string | null
+      signed?: Array<{ id: string }>
+      executed?: Array<{ id: string }>
+    }
+    const request = getEnvioGraphqlClient<{ Validator: EnvioValidatorRow[] }>()
     const res = await request(ENVIO_VALIDATORS_ACTIVITY_QUERY, { after: String(afterDate) })
     const rows = (res.Validator || []).filter(
-      (v) => String(v.bridgeType || '').toUpperCase() === bridgeValue,
+      (v: EnvioValidatorRow) => String(v.bridgeType || '').toUpperCase() === bridgeValue,
     )
-    return rows.map((v: any) => ({
+    return rows.map((v: EnvioValidatorRow) => ({
       name: v.name || v.address,
       value: Array.isArray(v.signed) ? v.signed.length : 0,
     }))
@@ -196,12 +212,19 @@ export const fetchExecutedTransactions = async (bridge: BridgesValues, afterDate
   const validators = VALIDATORS_BY_BRIDGE[bridgeValue]
 
   if (isEnvioBackend()) {
-    const request = getEnvioGraphqlClient<{ Validator: Array<any> }>()
+    type EnvioValidatorRow = {
+      address: string
+      name?: string | null
+      bridgeType?: string | null
+      signed?: Array<{ id: string }>
+      executed?: Array<{ id: string }>
+    }
+    const request = getEnvioGraphqlClient<{ Validator: EnvioValidatorRow[] }>()
     const res = await request(ENVIO_VALIDATORS_ACTIVITY_QUERY, { after: String(afterDate) })
     const rows = (res.Validator || []).filter(
-      (v) => String(v.bridgeType || '').toUpperCase() === bridgeValue,
+      (v: EnvioValidatorRow) => String(v.bridgeType || '').toUpperCase() === bridgeValue,
     )
-    return rows.map((v: any) => ({
+    return rows.map((v: EnvioValidatorRow) => ({
       name: v.name || v.address,
       value: Array.isArray(v.executed) ? v.executed.length : 0,
     }))

envio-indexer/.env.example

@@ -1 +1 @@
-# To create or update a token visit https://envio.dev/app/api-tokens
+ENVIO_RPC_HOME=

envio-indexer/config.yaml

@@ -7,12 +7,12 @@ raw_events: true
 networks:
 # [Home] (Gnosis)
 - id: 100
-  start_block: 7904944
+  start_block: 39568341
+
   contracts:
   - name: XDAIHome
     address:
     - 0x7301CFA0e1756B71869E93d4e4Dca5c7d0eb0AA6
-    start_block: 39567805
     handler: src/eventHandlers/XDAI/index.ts
     events:
     # [XDAI Home -> Foreign]
@@ -71,7 +71,6 @@ networks:
   - name: AMBHome
     address:
     - 0x75Df5AF045d91108662D8080fD1FEFAd6aA0bb59
-    start_block: 39567805
     handler: src/eventHandlers/AMB/index.ts
     events:
     # [AMB Home -> Foreign]
@@ -122,7 +121,7 @@ networks:
     - 0xbe20f60339b06db32c319d46cf3bc9bacc0694ab
     - 0x68a64df7458a8eb2677991e657508fe00205332d
     - 0x5f0fe58709639a39c193521d919afaef02e570f7
-    start_block: 39567805
+    # start_block: 39567805
     handler: src/eventHandlers/AMB/index.ts
     events:
     - event: TokensBridgingInitiated(address indexed token, address indexed sender, uint256 value, bytes32 indexed messageId)
@@ -131,7 +130,6 @@ networks:
   - name: XDAIBridgeValidators
     address:
     - 0xB289f0e6fBDFf8EEE340498a56e1787B303F1B6D
-    start_block: 7904944
     handler: src/eventHandlers/validator.ts
     events:
     - event: ValidatorAdded(address indexed validator)
@@ -146,7 +144,6 @@ networks:
   - name: AMBBridgeValidators
     address:
     - 0xA280feD8D7CaD9a76C8b50cA5c33c2534fFa5008
-    start_block: 7904944
     handler: src/eventHandlers/validator.ts
     events:
     - event: ValidatorAdded(address indexed validator)

envio-indexer/src/blockHandler.ts

@@ -1,28 +1,30 @@
 import { S, experimental_createEffect } from "envio";
 import { createPublicClient, http } from "viem";
 import { gnosis } from "viem/chains";
-import HomeBridgeAbi from "../../abi/HomeBridgeErcToNative.json";
+import HomeXDAIAbi from "../../abi/HomeBridgeErcToNative.json";
+import HomeAMBAbi from "../../abi/HomeAMB.json";
+import { BridgeTypeEnum } from "../const";
 
-export const getHomeMessageByHash = experimental_createEffect(
+export const getMessageByHash = experimental_createEffect(
   {
-    name: "getHomeMessageByHash",
+    name: "getMessageByHash",
     input: {
       address: S.string,
       messageHash: S.string,
+      bridge: S.string,
     },
     output: S.union([S.string, null]),
     cache: true,
   },
   async ({ input }) => {
-    const rpc = process.env.RPC_GNOSIS as `http${string}` | undefined;
+    const rpc = process.env.ENVIO_RPC_HOME as `http${string}` | undefined;
     if (!rpc) return null;
 
     const client = createPublicClient({ chain: gnosis, transport: http(rpc) });
-
     try {
       const bytes = await client.readContract({
         address: input.address as `0x${string}`,
-        abi: HomeBridgeAbi as any,
+        abi: input.bridge === BridgeTypeEnum.XDAI ? HomeXDAIAbi as any : HomeAMBAbi as any,
         functionName: "message",
         args: [input.messageHash as `0x${string}`],
       });

envio-indexer/src/effects/getAmbMessageByHash.ts

@@ -2,7 +2,7 @@ import { AMBForeign, AMBHome } from "generated";
 import { BridgeTypeEnum, CHAIN, TransactionStatusEnum } from "../../const";
 import { getValidator } from "../../utils/getValidator";
 import { isOmniBridgeUsage, extractReceiverFromEncodedData, parseMessageIdFromEncodedData } from "../../utils/omnibridge";
-import { getAmbMessageByHash } from "../../effects/getAmbMessageByHash";
+import { getMessageByHash } from "../../effects/getMessageByHash";
 
 /**
  * AMB Foreign -> Home (ETH -> GC)
@@ -61,9 +61,9 @@ AMBForeign.UserRequestForAffirmation.handler(async ({ event, context }) => {
 // 2. Validation. Validators sign transaction (update validator lastActivity)
 AMBHome.SignedForAffirmation.handler(async ({ event, context }) => {
   const signer = event.params.signer.toLowerCase();
-  const validator = await getValidator(context, signer);
+  const validator = await getValidator(context, signer, BridgeTypeEnum.AMB);
   if (!validator) {
-    context.log.error(`AMB: SignedForAffirmation - Validator ${signer} not found`);
+    context.log.error(`AMB: SignedForAffirmation - Validator ${signer} not found, tx hash: ${event.transaction.hash}`);
     return;
   }
   context.Validator.set({ ...validator, lastActivity: BigInt(event.block.timestamp) });
@@ -76,9 +76,10 @@ AMBHome.SignedForAffirmation.handler(async ({ event, context }) => {
   if (cached?.messageId) {
     messageId = cached.messageId;
   } else {
-    const encoded = await context.effect(getAmbMessageByHash, {
+    const encoded = await context.effect(getMessageByHash, {
       address: event.srcAddress,
       messageHash,
+      bridge: BridgeTypeEnum.AMB,
     });
     messageId = typeof encoded === "string" ? parseMessageIdFromEncodedData(encoded) : undefined;
     if (messageId) {
@@ -139,11 +140,13 @@ AMBHome.AffirmationCompleted.handler(async ({ event, context }) => {
   let executorId: string | undefined = undefined;
   let executorAddress: string | undefined = undefined;
   if (executorAddr) {
-    const validator = await getValidator(context, executorAddr);
+    const validator = await getValidator(context, executorAddr, BridgeTypeEnum.AMB);
     if (validator) {
       context.Validator.set({ ...validator, lastActivity: BigInt(timestamp) });
       executorId = validator.id;
       executorAddress = validator.address;
+    } else {
+      context.log.error(`AMB: AffirmationCompleted - Validator ${executorAddr} not found, tx hash: ${event.transaction.hash}`);
     }
   }