rename operatorRewardEvent -> rewardEvent and add op profile

autonomys · Aug 8, 2024 · 4e1756f · 4e1756f
1 parent fa53c60
commit 4e1756f
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 29 deletions.
diff --git a/...squid/db/migrations/1723116337937-Data.js → ...squid/db/migrations/1723119317871-Data.js b/...squid/db/migrations/1723116337937-Data.js → ...squid/db/migrations/1723119317871-Data.js
diff --git a/indexers/staking-squid/schema.graphql b/indexers/staking-squid/schema.graphql
@@ -56,14 +56,24 @@ type Operator @entity {
   id: ID! @index
   sortId: Int! @index
   accountId: String! @index
+  # creation args
   domainId: String! @index
   signingKey: String! @index
   minimumNominatorStake: BigInt!
   nominationTax: Int!
+  # public profile
+  name: String! @index
+  website: String
+  discord: String
+  github: String
+  twitter: String
+  # chain state
   currentTotalStake: BigInt!
   currentStorageFeeDeposit: BigInt!
   currentEpochRewards: BigInt!
   currentTotalShares: BigInt!
+  rawStatus: String
+  # increments
   totalDeposits: BigInt!
   totalTaxCollected: BigInt!
   totalRewardsCollected: BigInt!
@@ -79,10 +89,10 @@ type Operator @entity {
   totalConsensusStorageFee: BigInt!
   totalDomainExecutionFee: BigInt!
   totalBurnedBalance: BigInt!
-  rawStatus: String
-  status: OperatorStatus! @index
   activeEpochCount: Int!
   bundleCount: Int!
+  # status and timestamps
+  status: OperatorStatus! @index
   lastBundleAt: Int!
   createdAt: Int @index
   updatedAt: Int @index
@@ -195,7 +205,7 @@ type OperatorUnlockedFunds @entity {
   amount: BigInt!
 }
 
-type OperatorRewardEvent @entity {
+type RewardEvent @entity {
   id: ID! @index
   domainId: String! @index
   operatorId: String! @index

diff --git a/indexers/staking-squid/src/events/operator.ts b/indexers/staking-squid/src/events/operator.ts
@@ -2,7 +2,7 @@ import { NominatorStatus, OperatorStatus } from "../model";
 import type { CtxBlock, CtxEvent, CtxExtrinsic } from "../processor";
 import {
   createDeposit,
-  createOperatorRewardEvent,
+  createRewardEvent,
   getOrCreateAccount,
   getOrCreateDomain,
   getOrCreateNominator,
@@ -155,7 +155,7 @@ export function processOperatorRewardedEvent(
   domain.totalRewardsCollected += amount;
   cache.domains.set(domain.id, domain);
 
-  const operatorRewardedEvent = createOperatorRewardEvent(block, extrinsic, {
+  const operatorRewardedEvent = createRewardEvent(block, extrinsic, {
     operatorId: operator.id,
     domainId: operator.domainId,
     amount,

diff --git a/indexers/staking-squid/src/model/generated/index.ts b/indexers/staking-squid/src/model/generated/index.ts
@@ -12,7 +12,7 @@ export * from "./_depositStatus"
 export * from "./withdrawal.model"
 export * from "./_withdrawalStatus"
 export * from "./operatorUnlockedFunds.model"
-export * from "./operatorRewardEvent.model"
+export * from "./rewardEvent.model"
 export * from "./stats.model"
 export * from "./statsPerDomain.model"
 export * from "./statsPerOperator.model"
diff --git a/indexers/staking-squid/src/processor.ts b/indexers/staking-squid/src/processor.ts
@@ -58,6 +58,8 @@ export const processor = new SubstrateBatchProcessor()
       events.domains.storageFeeDeposited.name,
       // bundle
       events.domains.bundleStored.name,
+      // unlock
+      events.domains.fundsUnlocked.name,
       // rewards and slashing
       events.domains.operatorRewarded.name,
       events.domains.operatorSlashed.name,

diff --git a/indexers/staking-squid/src/storage/operator.ts b/indexers/staking-squid/src/storage/operator.ts
@@ -1,5 +1,5 @@
 import { randomUUID } from "crypto";
-import { Operator, OperatorRewardEvent, OperatorStatus } from "../model";
+import { Operator, OperatorStatus, RewardEvent } from "../model";
 import type { CtxBlock, CtxExtrinsic } from "../processor";
 import { getBlockNumber, getTimestamp, operatorUID } from "../utils";
 import { Cache } from "../utils/cache";
@@ -15,6 +15,11 @@ export const createOperator = (
     signingKey: "0x",
     minimumNominatorStake: BigInt(0),
     nominationTax: 0,
+    name: "",
+    website: "",
+    discord: "",
+    github: "",
+    twitter: "",
     currentTotalStake: BigInt(0),
     currentStorageFeeDeposit: BigInt(0),
     currentEpochRewards: BigInt(0),
@@ -59,12 +64,12 @@ export const getOrCreateOperator = (
   return operator;
 };
 
-export const createOperatorRewardEvent = (
+export const createRewardEvent = (
   block: CtxBlock,
   extrinsic: CtxExtrinsic,
-  props: Partial<OperatorRewardEvent>
-): OperatorRewardEvent =>
-  new OperatorRewardEvent({
+  props: Partial<RewardEvent>
+): RewardEvent =>
+  new RewardEvent({
     id: randomUUID(),
     ...props,
     blockNumber: getBlockNumber(block),

diff --git a/indexers/staking-squid/src/utils/cache.ts b/indexers/staking-squid/src/utils/cache.ts
@@ -8,7 +8,7 @@ import {
   Domain,
   Nominator,
   Operator,
-  OperatorRewardEvent,
+  RewardEvent,
   Stats,
   StatsPerDomain,
   StatsPerOperator,
@@ -28,7 +28,7 @@ export type TemporaryCache = {
   withdrawals: Map<string, Withdrawal>;
   bundles: Map<string, Bundle>;
   bundleAuthors: Map<string, BundleAuthor>;
-  operatorRewardedEvents: Map<string, OperatorRewardEvent>;
+  operatorRewardedEvents: Map<string, RewardEvent>;
   stats: Map<string, Stats>;
   statsPerDomain: Map<string, StatsPerDomain>;
   statsPerOperator: Map<string, StatsPerOperator>;
@@ -97,7 +97,9 @@ export const save = async (ctx: Ctx<Store>, cache: Cache) => {
   if (!cache.isModified) return;
 
   await Promise.all(
-    Object.keys(cache).map((k) => saveEntry(ctx, cache, k as keyof Cache))
+    Object.keys(cache).map((k) =>
+      k !== "isModified" ? saveEntry(ctx, cache, k as keyof Cache) : null
+    )
   );
 
   // Clear the cache for entries not needed for reference