From 7e9e1f5190860fcae1b6c8e78915b1fdabb77661 Mon Sep 17 00:00:00 2001 From: Raman Shekhawat Date: Mon, 20 Jan 2025 02:29:05 +0530 Subject: [PATCH] bugfix: MICRO-32 fix transfer metric and add total claims metric (#1512) micro-32 --- src/prom-metrics/definitions/migration.ts | 12 ++++++++++-- src/prom-metrics/definitions/transaction.ts | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/prom-metrics/definitions/migration.ts b/src/prom-metrics/definitions/migration.ts index 1fc6c1033..6a9f8cfb2 100644 --- a/src/prom-metrics/definitions/migration.ts +++ b/src/prom-metrics/definitions/migration.ts @@ -30,6 +30,13 @@ export const indexer_migration_efi_migrated_pct = new client.Gauge({ registers: [register], }) +export const indexer_migration_requests_total = new client.Gauge({ + name: 'indexer_migration_requests_total', + labelNames: ['migration'], + help: 'The total amount of tokens migration requests to the Enjin Blockchain.', + registers: [register], +}) + const ENJ_MIGRATION_TARGET = 1000_000_000 const EFI_MIGRATION_TARGET = 500_000_000 @@ -42,10 +49,10 @@ export default async () => { const em = connection.manager - // TODO: fix this query, find 22 missing entries of claim_request - const [enjMigrated, efiMigrated] = await Promise.all([ + const [enjMigrated, efiMigrated, claimRequests] = await Promise.all([ em.query('SELECT SUM(enj_sum) FROM claim'), em.query('SELECT SUM(efi_sum) FROM claim'), + em.query('SELECT SUM(amount_claimable)::numeric / POW(10,18) AS sum FROM claim_request'), ]) const enjMigratedTotal = BigInt(enjMigrated[0].sum || 0) / BigInt(10 ** 18) @@ -55,4 +62,5 @@ export default async () => { indexer_migration_enj_migrated_pct.set((Number(enjMigratedTotal) / ENJ_MIGRATION_TARGET) * 100) indexer_migration_efi_migrated_total.set(Number(efiMigratedTotal)) indexer_migration_efi_migrated_pct.set((Number(efiMigratedTotal) / EFI_MIGRATION_TARGET) * 100) + indexer_migration_requests_total.set(Number(claimRequests[0].sum)) } diff --git a/src/prom-metrics/definitions/transaction.ts b/src/prom-metrics/definitions/transaction.ts index 114daa640..44b78706c 100644 --- a/src/prom-metrics/definitions/transaction.ts +++ b/src/prom-metrics/definitions/transaction.ts @@ -34,7 +34,9 @@ export default async () => { const [extrinsicsTotal, enjTransferTotal, tokenTransferTotal] = await Promise.all([ em.query('SELECT COUNT(*) FROM extrinsic WHERE success = true'), - em.query("SELECT COUNT(*) FROM extrinsic WHERE method = 'transfer' AND pallet = 'Balances' AND success = true"), + em.query( + "SELECT COUNT(*) FROM extrinsic WHERE method IN ('transfer', 'transfer_keep_alive', 'transfer_allow_death', 'force_transfer', 'transfer_all') AND pallet = 'Balances' AND success = true" + ), em.query("SELECT COUNT(*) FROM extrinsic WHERE method = 'transfer' AND pallet = 'MultiTokens' AND success = true"), ])