Add TraderateChanged for ARM

schema.graphql

@@ -824,6 +824,17 @@ type ArmWithdrawalRequest @entity {
   queued: BigInt!
   claimed: Boolean!
 }
+
+type TraderateChanged @entity {
+  id: ID!
+  chainId: Int! @index
+  txHash: String! @index
+  timestamp: DateTime! @index
+  blockNumber: Int! @index
+  address: String! @index
+  traderate0: BigInt!
+  traderate1: BigInt!
+}
 type CoinGeckoCoinData @entity {
   id: ID!
   product: String! @index

schema/arm.graphql

@@ -75,3 +75,14 @@ type ArmWithdrawalRequest @entity {
   queued: BigInt!
   claimed: Boolean!
 }
+
+type TraderateChanged @entity {
+  id: ID!
+  chainId: Int! @index
+  txHash: String! @index
+  timestamp: DateTime! @index
+  blockNumber: Int! @index
+  address: String! @index
+  traderate0: BigInt!
+  traderate1: BigInt!
+}

src/model/generated/index.ts

@@ -57,6 +57,7 @@ export * from "./arm.model"
 export * from "./armState.model"
 export * from "./armDailyStat.model"
 export * from "./armWithdrawalRequest.model"
+export * from "./traderateChanged.model"
 export * from "./coinGeckoCoinData.model"
 export * from "./esToken.model"
 export * from "./esAccount.model"

src/model/generated/traderateChanged.model.ts

@@ -0,0 +1,37 @@
+import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, IntColumn as IntColumn_, Index as Index_, StringColumn as StringColumn_, DateTimeColumn as DateTimeColumn_, BigIntColumn as BigIntColumn_} from "@subsquid/typeorm-store"
+
+@Entity_()
+export class TraderateChanged {
+    constructor(props?: Partial<TraderateChanged>) {
+        Object.assign(this, props)
+    }
+
+    @PrimaryColumn_()
+    id!: string
+
+    @Index_()
+    @IntColumn_({nullable: false})
+    chainId!: number
+
+    @Index_()
+    @StringColumn_({nullable: false})
+    txHash!: string
+
+    @Index_()
+    @DateTimeColumn_({nullable: false})
+    timestamp!: Date
+
+    @Index_()
+    @IntColumn_({nullable: false})
+    blockNumber!: number
+
+    @Index_()
+    @StringColumn_({nullable: false})
+    address!: string
+
+    @BigIntColumn_({nullable: false})
+    traderate0!: bigint
+
+    @BigIntColumn_({nullable: false})
+    traderate1!: bigint
+}

src/oeth/processors/strategies.ts

@@ -171,10 +171,8 @@ const eventProcessors = [
   ...OETH_NATIVE_STRATEGY_ADDRESSES.map((address) =>
     createEventProcessor({
       address,
-      eventName: 'AccountingConsensusRewards',
       event: nativeStakingAbi.events.AccountingConsensusRewards,
       from: 20046251,
-      Entity: AccountingConsensusRewards,
       mapEntity: (ctx, block, log, decoded) =>
         new AccountingConsensusRewards({
           id: `${ctx.chain.id}:${log.id}`,
@@ -188,10 +186,8 @@ const eventProcessors = [
   ),
   createEventProcessor({
     address: addresses.oeth.nativeStakingFeeAccumulator,
-    eventName: 'ExecutionRewardsCollected',
     event: feeAccumulatorAbi.events.ExecutionRewardsCollected,
     from: 20046238,
-    Entity: ExecutionRewardsCollected,
     mapEntity: (ctx, block, log, decoded) =>
       new ExecutionRewardsCollected({
         id: `${ctx.chain.id}:${log.id}`,

src/templates/events/createEventProcessor.ts

@@ -5,14 +5,11 @@ import { DecodedStruct, Struct } from '@subsquid/evm-codec'
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { Entity } from '@subsquid/typeorm-store/lib/store'
 import { logFilter } from '@utils/logFilter'
-import { EntityClassT } from '@utils/type'
 
 export const createEventProcessor = <T extends Struct, EventEntity extends Entity>(params: {
-  eventName: string
   event: ReturnType<typeof event<T>>
   address: string
   from: number
-  Entity: EntityClassT<EventEntity>
   mapEntity: (ctx: Context, block: Block, log: Log, decoded: DecodedStruct<IndexedCodecs<T>>) => EventEntity
   extraFilterArgs?: {
     topic1?: string[]
@@ -35,7 +32,7 @@ export const createEventProcessor = <T extends Struct, EventEntity extends Entit
       for (const log of block.logs) {
         if (filter.matches(log)) {
           const decoded = params.event.decode(log)
-          const entity = new params.Entity(params.mapEntity(ctx, block, log, decoded))
+          const entity = params.mapEntity(ctx, block, log, decoded)
           entities.push(entity)
         }
       }

src/templates/origin-arm/origin-arm.ts

@@ -4,10 +4,11 @@ import { last } from 'lodash'
 import * as erc20Abi from '@abi/erc20'
 import * as originLidoArmAbi from '@abi/origin-lido-arm'
 import * as originLidoArmCapManagerAbi from '@abi/origin-lido-arm-cap-manager'
-import { Arm, ArmDailyStat, ArmState, ArmWithdrawalRequest } from '@model'
+import { Arm, ArmDailyStat, ArmState, ArmWithdrawalRequest, TraderateChanged } from '@model'
 import { Block, Context, Processor } from '@processor'
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { createERC20SimpleTracker } from '@templates/erc20-simple'
+import { createEventProcessor } from '@templates/events/createEventProcessor'
 import { blockFrequencyTracker } from '@utils/blockFrequencyUpdater'
 import { calculateAPY } from '@utils/calculateAPY'
 import { logFilter } from '@utils/logFilter'
@@ -48,6 +49,23 @@ export const createOriginARMProcessors = ({
     topic0: [originLidoArmAbi.events.FeeCollected.topic],
     range: { from },
   })
+  const tradeRateProcessor = createEventProcessor({
+    event: originLidoArmAbi.events.TraderateChanged,
+    address: armAddress,
+    from,
+    mapEntity: (ctx, block, log, decoded) => {
+      return new TraderateChanged({
+        id: `${ctx.chain.id}:${log.id}`,
+        chainId: ctx.chain.id,
+        txHash: log.transactionHash,
+        timestamp: new Date(block.header.timestamp),
+        blockNumber: block.header.height,
+        address: armAddress,
+        traderate0: decoded.traderate0,
+        traderate1: decoded.traderate1,
+      })
+    },
+  })
   const tracker = blockFrequencyTracker({ from })
   let armEntity: Arm
   let initialized = false
@@ -92,6 +110,7 @@ export const createOriginARMProcessors = ({
         p.addLog(depositFilter.value)
         p.addLog(withdrawalFilter.value)
         p.addLog(feeCollectedFilter.value)
+        tradeRateProcessor.setup(p)
       },
       initialize,
       process: async (ctx: Context) => {
@@ -103,7 +122,7 @@ export const createOriginARMProcessors = ({
         const dailyStatsMap = new Map<string, ArmDailyStat>()
         const redemptionMap = new Map<string, ArmWithdrawalRequest>()
         const getStateId = (block: Block) => `${ctx.chain.id}:${block.header.height}:${armAddress}`
-        const getPreviousState = async (block: Block) => {
+        const getPreviousState = async () => {
           return (
             last(states) ??
             (await ctx.store.findOne(ArmState, {
@@ -117,28 +136,19 @@ export const createOriginARMProcessors = ({
           if (states[states.length - 1]?.id === stateId) {
             return states[states.length - 1]
           }
-          const previousState = await getPreviousState(block)
+          const previousState = await getPreviousState()
           const armContract = new originLidoArmAbi.Contract(ctx, block.header, armAddress)
           const controllerContract = new originLidoArmCapManagerAbi.Contract(ctx, block.header, capManagerAddress)
-          const [
-            assets0,
-            assets1,
-            outstandingAssets1,
-            totalAssets,
-            totalAssetsCap,
-            totalSupply,
-            assetsPerShare,
-            feesAccrued,
-          ] = await Promise.all([
-            new erc20Abi.Contract(ctx, block.header, armEntity.token0).balanceOf(armAddress),
-            new erc20Abi.Contract(ctx, block.header, armEntity.token1).balanceOf(armAddress),
-            armContract.lidoWithdrawalQueueAmount(),
-            armContract.totalAssets(),
-            controllerContract.totalAssetsCap(),
-            armContract.totalSupply(),
-            armContract.previewRedeem(10n ** 18n),
-            armContract.feesAccrued(),
-          ])
+          const [assets0, assets1, outstandingAssets1, totalAssets, totalAssetsCap, totalSupply, assetsPerShare] =
+            await Promise.all([
+              new erc20Abi.Contract(ctx, block.header, armEntity.token0).balanceOf(armAddress),
+              new erc20Abi.Contract(ctx, block.header, armEntity.token1).balanceOf(armAddress),
+              armContract.lidoWithdrawalQueueAmount(),
+              armContract.totalAssets(),
+              controllerContract.totalAssetsCap(),
+              armContract.totalSupply(),
+              armContract.previewRedeem(10n ** 18n),
+            ])
           const date = new Date(block.header.timestamp)
           const armStateEntity = new ArmState({
             id: stateId,
@@ -259,6 +269,7 @@ export const createOriginARMProcessors = ({
         await ctx.store.insert(states)
         await ctx.store.upsert([...dailyStatsMap.values()])
         await ctx.store.upsert([...redemptionMap.values()])
+        await tradeRateProcessor.process(ctx)
       },
     },
     // The ARM is an ERC20, so we can use the ERC20SimpleTracker to track holder balances